Refactored database with GDBM style GetDatabase/GetDatabase2