modell refactored in favor of xml generation, utility classes added