Changes to Data Parser