more function support

Change-Id: Ia12c537bbe016552bf4529b7860a8fd43d14cd07