JSON parsing improvements