Added some new data classes and XML parsing