Db table refactoring