Changed Json Implementation