Added the remaining missing methods

Change-Id: I0e64925efc5eae2855025de718b9a12ac866a9e6