Refactored DB methods