data model sources refactoring