Adding database refactoring.