improved data model, added collumns to tree view
improved data model