Edited TokenHelper