Update API implementation to refreshed design

Change-Id: I98fc364ce0bdb91df3b8523d5e79274ba785774f