Merge changes Ie56681d3,Ief4f2782

* changes:
  Implement some missing submodel classes.
  Adjusts namespaces and include of connected classes to refactoring