Updating parsing messages for clarity
Adding more information to object model, pulling description into models, reducing duplication