Add some needed methods

Change-Id: Ie8fade89a2e124bb501ea877ef02fc6c063387e8