diff --git a/src/core/components/operations.jsx b/src/core/components/operations.jsx
index ef1d4248..724c82f9 100644
--- a/src/core/components/operations.jsx
+++ b/src/core/components/operations.jsx
@@ -1,8 +1,5 @@
 import React from "react"
 import PropTypes from "prop-types"
-import { helpers } from "swagger-client"
-
-const { opId } = helpers
 
 export default class Operations extends React.Component {
 
@@ -32,7 +29,7 @@ export default class Operations extends React.Component {
 
     let taggedOps = specSelectors.taggedOperations()
 
-    const Operation = getComponent("operation")
+    const Operation = getComponent("OperationContainer", true)
     const Collapse = getComponent("Collapse")
 
     let showSummary = layoutSelectors.showSummary()
@@ -117,42 +114,20 @@ export default class Operations extends React.Component {
                   <Collapse isOpened={showTag}>
                     {
                       operations.map( op => {
-
-                        const path = op.get("path", "")
-                        const method = op.get("method", "")
-                        const jumpToKey = `paths.${path}.${method}`
-
-                        const operationId =
-                        op.getIn(["operation", "operationId"]) || op.getIn(["operation", "__originalOperationId"]) || opId(op.get("operation"), path, method) || op.get("id")
-                        const isShownKey = ["operations", tag, operationId]
-
-                        const allowTryItOut = specSelectors.allowTryItOutFor(op.get("path"), op.get("method"))
-                        const response = specSelectors.responseFor(op.get("path"), op.get("method"))
-                        const request = specSelectors.requestFor(op.get("path"), op.get("method"))
-
                         return <Operation
-                          {...op.toObject()}
-
-                          isShownKey={isShownKey}
-                          jumpToKey={jumpToKey}
+                          key={`${op.get("path")}-${op.get("method")}`}
+                          op={op}
+                          tag={tag}
                           showSummary={showSummary}
-                          key={isShownKey}
-                          response={ response }
-                          request={ request }
-                          allowTryItOut={allowTryItOut}
-
                           displayOperationId={displayOperationId}
                           displayRequestDuration={displayRequestDuration}
 
                           specActions={ specActions }
                           specSelectors={ specSelectors }
-
                           layoutActions={ layoutActions }
                           layoutSelectors={ layoutSelectors }
-
                           authActions={ authActions }
                           authSelectors={ authSelectors }
-
                           getComponent={ getComponent }
                           fn={fn}
                           getConfigs={ getConfigs }