Made grammar more flexible