Updated jsonService code