Added Gateway property for Conformance enabling