Major update on the parser