Revamped tokenparse