content provider refactoring - consider http content-type for instrumentation