Khushal/Sailee: Refactored all the parsers