Added token enumerations and common functions