Added conformance refactor