add mapping relation in FunctoinCustom instead of Tokens and modifying test cases according to Xin's review