Refactored Database Methods