Implement missing methods

Change-Id: I8f341928253704a79a8cdb6c808418206213defa