Added grammar for parsing