Less verbose and requires less work for the library. Change-Id: Ied2196b548c91324fdfce39ec4f8801e59da4f6c