Data provider administration refactor