Fixing api

Change-Id: I3a8949261b67c3dc211c6a3c4ff00bb4221c1f51