Added a token and phrase class