Reloc of DatabaseAdapter, fixes