Updated Parser class