Final mods to make db manager work correctly;