Add visibility to User functions

Change-Id: Ib2bea5ba8132e79345b46ec3e6db7576af07a007