Added Type and Op to the grammar
Expanded Type in grammar