Object change

Updated objects and removed JSON