MidChange for parser and Data Structures

Little bit of a change for the Data structures and the parser