Refactored DB