refactoring entitiemodel, columns changed!