Use JSON when available [fixed]