Update grammar with correct reference/imports