Add Grammar for mapping