Changed grammar for enumeration