Add lower level token command and base class