Rework the Conformance file to match current spec and Ehmbr formatting