refactoring (commonDB)