Add user stack
Remove hard-coding of user function