Added new Error and Token enums.