Narrowing down the API

Change-Id: I829e41304ce9095aca81175f406e09848d4dc2de