Add missing functions

Change-Id: Ib795e13a2b45b4c622b6fafffd673e8f91a46984