Added some tokens for user defined functions