database model refactoring