Added rules for constants and indentifiers