Grammar update plus regeneration: 2.0.4