Updated the classes for parsing and reading