Command and Token "types" should be recognized, the code should be less unclear