Make JsonProvider more re-usable