Added isp, org, and domain fields to CanonicalOutput