Match our Objects api

Change-Id: Iac03a661dedb9026445f962b2fcbea5cf795ca51