Re-add JSON parsing