Refactored database namespace