Added 'identifier' and 'literal'