Feature/conformance