Added stubs for more grammar productions