Switch from using Actuator to Events
Refactor token class