Updates to all methods

Change-Id: I09916438dd15c7bc6dae16214457dd92802df9d8