DB configuration refactoring
Fix requires