Refactor Prov DB handling