Added a tokenizing control