Add token constructors and pretty printer