Updated Token Parsing Functionality