Updated api and fixed JSONProvider issue