Changes to datamodel and addition of new classes