Fixing potential namespace issues in DB class