added all enumerated types for token