Adds proxy functions

Change-Id: I5124a85ea15dd6baf2e624c8c7e857dece7906a5