Structure changes on code and json custom parsing addition