Major changes to parsing mechanism and struct