refactoring, MapDB updates