json class implementation and parsing changes