Updating Parser for new formats