Added token definitions for identifier, number and string