Updated conformance