Added some more model classes.. Structure is not perfect but currently mirrors the API response we are getting..
Some small refactorings ;)