Changed productions rules to new "Action" syntax