Updated Parser Grammar