Added conditions to optional JSON properties.