More jsonService changes