Moved the NonHiveOutput into the CanonicalOutput