DatabaseImpl fixed