Added datastructues to hold grammar entities