DB refactoring.