Added more struct planning for the parser