some changes in the model classes and its xml-descriptions