Added GS and PQ cards to new grammar