diff --git a/ngraph/core/include/ngraph/opsets/opset.hpp b/ngraph/core/include/ngraph/opsets/opset.hpp
index c1f6430a8c8..039abf863d7 100644
--- a/ngraph/core/include/ngraph/opsets/opset.hpp
+++ b/ngraph/core/include/ngraph/opsets/opset.hpp
@@ -12,99 +12,36 @@
 #include "ngraph/factory.hpp"
 #include "ngraph/ngraph_visibility.hpp"
 #include "ngraph/node.hpp"
+#include "openvino/opsets/opset.hpp"
 
 namespace ngraph {
 /// \brief Run-time opset information
-class NGRAPH_API OpSet {
+class NGRAPH_API OpSet : public ov::OpSet {
     static std::mutex& get_mutex();
 
 public:
-    OpSet() {}
-    std::set<NodeTypeInfo>::size_type size() const {
-        std::lock_guard<std::mutex> guard(get_mutex());
-        return m_op_types.size();
-    }
+    explicit OpSet(const ov::OpSet& opset);
+    OpSet(const ngraph::OpSet& opset) = default;
+    OpSet() = default;
     /// \brief Insert an op into the opset with a particular name and factory
     void insert(const std::string& name, const NodeTypeInfo& type_info, FactoryRegistry<Node>::Factory factory) {
-        std::lock_guard<std::mutex> guard(get_mutex());
-        m_op_types.insert(type_info);
-        m_name_type_info_map[name] = type_info;
-        m_case_insensitive_type_info_map[to_upper_name(name)] = type_info;
-        m_factory_registry.register_factory(type_info, factory);
+        return insert(name, type_info, std::move(factory));
     }
-
     /// \brief Insert OP_TYPE into the opset with a special name and the default factory
     template <typename OP_TYPE>
     void insert(const std::string& name) {
-        insert(name, OP_TYPE::type_info, FactoryRegistry<Node>::get_default_factory<OP_TYPE>());
+        ov::OpSet::insert<OP_TYPE>(name);
     }
 
     /// \brief Insert OP_TYPE into the opset with the default name and factory
     template <typename OP_TYPE>
     void insert() {
-        insert<OP_TYPE>(OP_TYPE::type_info.name);
+        ov::OpSet::insert<OP_TYPE>(OP_TYPE::type_info.name);
     }
 
-    const std::set<NodeTypeInfo>& get_types_info() const {
-        return m_op_types;
-    }
-    /// \brief Create the op named name using it's factory
-    ngraph::Node* create(const std::string& name) const;
-
-    /// \brief Create the op named name using it's factory
-    ngraph::Node* create_insensitive(const std::string& name) const;
-
-    /// \brief Return true if OP_TYPE is in the opset
-    bool contains_type(const NodeTypeInfo& type_info) const {
-        std::lock_guard<std::mutex> guard(get_mutex());
-        return m_op_types.find(type_info) != m_op_types.end();
-    }
-
-    /// \brief Return true if OP_TYPE is in the opset
-    template <typename OP_TYPE>
-    bool contains_type() const {
-        return contains_type(OP_TYPE::type_info);
-    }
-
-    /// \brief Return true if name is in the opset
-    bool contains_type(const std::string& name) const {
-        std::lock_guard<std::mutex> guard(get_mutex());
-        return m_name_type_info_map.find(name) != m_name_type_info_map.end();
-    }
-
-    /// \brief Return true if name is in the opset
-    bool contains_type_insensitive(const std::string& name) const {
-        std::lock_guard<std::mutex> guard(get_mutex());
-        return m_case_insensitive_type_info_map.find(to_upper_name(name)) != m_case_insensitive_type_info_map.end();
-    }
-
-    /// \brief Return true if node's type is in the opset
-    bool contains_op_type(const Node* node) const {
-        std::lock_guard<std::mutex> guard(get_mutex());
-        return m_op_types.find(node->get_type_info()) != m_op_types.end();
-    }
-
-    const std::set<NodeTypeInfo>& get_type_info_set() const {
-        return m_op_types;
-    }
     ngraph::FactoryRegistry<ngraph::Node>& get_factory_registry() {
         return m_factory_registry;
     }
-
-protected:
-    static std::string to_upper_name(const std::string& name) {
-        std::string upper_name = name;
-        std::locale loc;
-        std::transform(upper_name.begin(), upper_name.end(), upper_name.begin(), [&loc](char c) {
-            return std::toupper(c, loc);
-        });
-        return upper_name;
-    }
-
-    ngraph::FactoryRegistry<ngraph::Node> m_factory_registry;
-    std::set<NodeTypeInfo> m_op_types;
-    std::map<std::string, NodeTypeInfo> m_name_type_info_map;
-    std::map<std::string, NodeTypeInfo> m_case_insensitive_type_info_map;
 };
 
 const NGRAPH_API OpSet& get_opset1();
diff --git a/ngraph/core/include/ngraph/opsets/opset1_tbl.hpp b/ngraph/core/include/ngraph/opsets/opset1_tbl.hpp
index 03000cffbbb..3a088f9eb66 100644
--- a/ngraph/core/include/ngraph/opsets/opset1_tbl.hpp
+++ b/ngraph/core/include/ngraph/opsets/opset1_tbl.hpp
@@ -38,113 +38,6 @@
 #    define NGRAPH_OP(x, y)
 #endif
 
-NGRAPH_OP(Abs, ngraph::op::v0)
-NGRAPH_OP(Acos, ngraph::op::v0)
-NGRAPH_OP(Add, ngraph::op::v1)
-NGRAPH_OP(Asin, ngraph::op::v0)
-NGRAPH_OP(Atan, ngraph::op::v0)
-NGRAPH_OP(AvgPool, ngraph::op::v1)
-NGRAPH_OP(BatchNormInference, ngraph::op::v0)
-NGRAPH_OP(BinaryConvolution, ngraph::op::v1)
-NGRAPH_OP(Broadcast, ngraph::op::v1)
-NGRAPH_OP(CTCGreedyDecoder, ngraph::op::v0)
-NGRAPH_OP(Ceiling, ngraph::op::v0)
-NGRAPH_OP(Clamp, ngraph::op::v0)
-NGRAPH_OP(Concat, ngraph::op::v0)
-NGRAPH_OP(Constant, ngraph::op)
-NGRAPH_OP(Convert, ngraph::op::v0)
-NGRAPH_OP(ConvertLike, ngraph::op::v1)
-NGRAPH_OP(Convolution, ngraph::op::v1)
-NGRAPH_OP(ConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(Cos, ngraph::op::v0)
-NGRAPH_OP(Cosh, ngraph::op::v0)
-NGRAPH_OP(DeformableConvolution, ngraph::op::v1)
-NGRAPH_OP(DeformablePSROIPooling, ngraph::op::v1)
-NGRAPH_OP(DepthToSpace, ngraph::op::v0)
-NGRAPH_OP(DetectionOutput, ngraph::op::v0)
-NGRAPH_OP(Divide, ngraph::op::v1)
-NGRAPH_OP(Elu, ngraph::op::v0)
-NGRAPH_OP(Erf, ngraph::op::v0)
-NGRAPH_OP(Equal, ngraph::op::v1)
-NGRAPH_OP(Exp, ngraph::op::v0)
-NGRAPH_OP(FakeQuantize, ngraph::op::v0)
-NGRAPH_OP(Floor, ngraph::op::v0)
-NGRAPH_OP(FloorMod, ngraph::op::v1)
-NGRAPH_OP(Gather, ngraph::op::v1)
-NGRAPH_OP(GatherTree, ngraph::op::v1)
-NGRAPH_OP(Greater, ngraph::op::v1)
-NGRAPH_OP(GreaterEqual, ngraph::op::v1)
-NGRAPH_OP(GroupConvolution, ngraph::op::v1)
-NGRAPH_OP(GroupConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(GRN, ngraph::op::v0)
-NGRAPH_OP(HardSigmoid, ngraph::op::v0)
-NGRAPH_OP(Interpolate, ngraph::op::v0)
-NGRAPH_OP(Less, ngraph::op::v1)
-NGRAPH_OP(LessEqual, ngraph::op::v1)
-NGRAPH_OP(Log, ngraph::op::v0)
-NGRAPH_OP(LogicalAnd, ngraph::op::v1)
-NGRAPH_OP(LogicalNot, ngraph::op::v1)
-NGRAPH_OP(LogicalOr, ngraph::op::v1)
-NGRAPH_OP(LogicalXor, ngraph::op::v1)
-NGRAPH_OP(LRN, ngraph::op::v0)
-NGRAPH_OP(LSTMCell, ngraph::op::v0)
-NGRAPH_OP(LSTMSequence, ngraph::op::v0)
-NGRAPH_OP(MatMul, ngraph::op::v0)
-NGRAPH_OP(MaxPool, ngraph::op::v1)
-NGRAPH_OP(Maximum, ngraph::op::v1)
-NGRAPH_OP(Minimum, ngraph::op::v1)
-NGRAPH_OP(Mod, ngraph::op::v1)
-NGRAPH_OP(Multiply, ngraph::op::v1)
-NGRAPH_OP(Negative, ngraph::op::v0)
-NGRAPH_OP(NonMaxSuppression, ngraph::op::v1)
-NGRAPH_OP(NormalizeL2, ngraph::op::v0)
-NGRAPH_OP(NotEqual, ngraph::op::v1)
-NGRAPH_OP(OneHot, ngraph::op::v1)
-NGRAPH_OP(PRelu, ngraph::op::v0)
-NGRAPH_OP(PSROIPooling, ngraph::op::v0)
-NGRAPH_OP(Pad, ngraph::op::v1)
-NGRAPH_OP(Parameter, ngraph::op::v0)
-NGRAPH_OP(Power, ngraph::op::v1)
-NGRAPH_OP(PriorBox, ngraph::op::v0)
-NGRAPH_OP(PriorBoxClustered, ngraph::op::v0)
-NGRAPH_OP(Proposal, ngraph::op::v0)
-NGRAPH_OP(Range, ngraph::op::v0)
-NGRAPH_OP(Relu, ngraph::op::v0)
-NGRAPH_OP(ReduceMax, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalAnd, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalOr, ngraph::op::v1)
-NGRAPH_OP(ReduceMean, ngraph::op::v1)
-NGRAPH_OP(ReduceMin, ngraph::op::v1)
-NGRAPH_OP(ReduceProd, ngraph::op::v1)
-NGRAPH_OP(ReduceSum, ngraph::op::v1)
-NGRAPH_OP(RegionYolo, ngraph::op::v0)
-NGRAPH_OP(Reshape, ngraph::op::v1)
-NGRAPH_OP(Result, ngraph::op::v0)
-NGRAPH_OP(Reverse, ngraph::op::v1)
-NGRAPH_OP(ReverseSequence, ngraph::op::v0)
-NGRAPH_OP(RNNCell, ngraph::op::v0)
-NGRAPH_OP(Select, ngraph::op::v1)
-NGRAPH_OP(Selu, ngraph::op::v0)
-NGRAPH_OP(ShapeOf, ngraph::op::v0)
-NGRAPH_OP(ShuffleChannels, ngraph::op::v0)
-NGRAPH_OP(Sign, ngraph::op::v0)
-NGRAPH_OP(Sigmoid, ngraph::op::v0)
-NGRAPH_OP(Sin, ngraph::op::v0)
-NGRAPH_OP(Sinh, ngraph::op::v0)
-NGRAPH_OP(Softmax, ngraph::op::v1)
-NGRAPH_OP(Sqrt, ngraph::op::v0)
-NGRAPH_OP(SpaceToDepth, ngraph::op::v0)
-NGRAPH_OP(Split, ngraph::op::v1)
-NGRAPH_OP(SquaredDifference, ngraph::op::v0)
-NGRAPH_OP(Squeeze, ngraph::op::v0)
-NGRAPH_OP(StridedSlice, ngraph::op::v1)
-NGRAPH_OP(Subtract, ngraph::op::v1)
-NGRAPH_OP(Tan, ngraph::op::v0)
-NGRAPH_OP(Tanh, ngraph::op::v0)
-NGRAPH_OP(TensorIterator, ngraph::op::v0)
-NGRAPH_OP(Tile, ngraph::op::v0)
-NGRAPH_OP(TopK, ngraph::op::v1)
-NGRAPH_OP(Transpose, ngraph::op::v1)
-NGRAPH_OP(Unsqueeze, ngraph::op::v0)
-NGRAPH_OP(VariadicSplit, ngraph::op::v1)
-NGRAPH_OP(Xor, ngraph::op::v0)
+#define OPENVINO_OP NGRAPH_OP
+#include "openvino/opsets/opset1_tbl.hpp"
+#undef OPENVINO_OP
diff --git a/ngraph/core/include/ngraph/opsets/opset2_tbl.hpp b/ngraph/core/include/ngraph/opsets/opset2_tbl.hpp
index 122cba77f90..3dc125d1daf 100644
--- a/ngraph/core/include/ngraph/opsets/opset2_tbl.hpp
+++ b/ngraph/core/include/ngraph/opsets/opset2_tbl.hpp
@@ -7,137 +7,6 @@
 #    define NGRAPH_OP(x, y)
 #endif
 
-NGRAPH_OP(Abs, ngraph::op::v0)
-NGRAPH_OP(Acos, ngraph::op::v0)
-NGRAPH_OP(Add, ngraph::op::v1)
-NGRAPH_OP(Asin, ngraph::op::v0)
-NGRAPH_OP(Atan, ngraph::op::v0)
-NGRAPH_OP(AvgPool, ngraph::op::v1)
-NGRAPH_OP(BatchNormInference, ngraph::op::v0)
-NGRAPH_OP(BinaryConvolution, ngraph::op::v1)
-NGRAPH_OP(Broadcast, ngraph::op::v1)
-NGRAPH_OP(CTCGreedyDecoder, ngraph::op::v0)
-NGRAPH_OP(Ceiling, ngraph::op::v0)
-NGRAPH_OP(Clamp, ngraph::op::v0)
-NGRAPH_OP(Concat, ngraph::op::v0)
-NGRAPH_OP(Constant, ngraph::op)
-NGRAPH_OP(Convert, ngraph::op::v0)
-NGRAPH_OP(ConvertLike, ngraph::op::v1)
-NGRAPH_OP(Convolution, ngraph::op::v1)
-NGRAPH_OP(ConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(Cos, ngraph::op::v0)
-NGRAPH_OP(Cosh, ngraph::op::v0)
-NGRAPH_OP(DeformableConvolution, ngraph::op::v1)
-NGRAPH_OP(DeformablePSROIPooling, ngraph::op::v1)
-NGRAPH_OP(DepthToSpace, ngraph::op::v0)
-NGRAPH_OP(DetectionOutput, ngraph::op::v0)
-NGRAPH_OP(Divide, ngraph::op::v1)
-NGRAPH_OP(Elu, ngraph::op::v0)
-NGRAPH_OP(Erf, ngraph::op::v0)
-NGRAPH_OP(Equal, ngraph::op::v1)
-NGRAPH_OP(Exp, ngraph::op::v0)
-NGRAPH_OP(FakeQuantize, ngraph::op::v0)
-NGRAPH_OP(Floor, ngraph::op::v0)
-NGRAPH_OP(FloorMod, ngraph::op::v1)
-NGRAPH_OP(Gather, ngraph::op::v1)
-NGRAPH_OP(GatherTree, ngraph::op::v1)
-NGRAPH_OP(Greater, ngraph::op::v1)
-NGRAPH_OP(GreaterEqual, ngraph::op::v1)
-NGRAPH_OP(GroupConvolution, ngraph::op::v1)
-NGRAPH_OP(GroupConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(GRN, ngraph::op::v0)
-NGRAPH_OP(HardSigmoid, ngraph::op::v0)
-NGRAPH_OP(Interpolate, ngraph::op::v0)
-NGRAPH_OP(Less, ngraph::op::v1)
-NGRAPH_OP(LessEqual, ngraph::op::v1)
-NGRAPH_OP(Log, ngraph::op::v0)
-NGRAPH_OP(LogicalAnd, ngraph::op::v1)
-NGRAPH_OP(LogicalNot, ngraph::op::v1)
-NGRAPH_OP(LogicalOr, ngraph::op::v1)
-NGRAPH_OP(LogicalXor, ngraph::op::v1)
-NGRAPH_OP(LRN, ngraph::op::v0)
-NGRAPH_OP(LSTMCell, ngraph::op::v0)
-NGRAPH_OP(LSTMSequence, ngraph::op::v0)
-NGRAPH_OP(MatMul, ngraph::op::v0)
-NGRAPH_OP(MaxPool, ngraph::op::v1)
-NGRAPH_OP(Maximum, ngraph::op::v1)
-NGRAPH_OP(Minimum, ngraph::op::v1)
-NGRAPH_OP(Mod, ngraph::op::v1)
-NGRAPH_OP(Multiply, ngraph::op::v1)
-
-NGRAPH_OP(MVN, ngraph::op::v0)  // Missing in opset1
-
-NGRAPH_OP(Negative, ngraph::op::v0)
-NGRAPH_OP(NonMaxSuppression, ngraph::op::v1)
-NGRAPH_OP(NormalizeL2, ngraph::op::v0)
-NGRAPH_OP(NotEqual, ngraph::op::v1)
-NGRAPH_OP(OneHot, ngraph::op::v1)
-NGRAPH_OP(PRelu, ngraph::op::v0)
-NGRAPH_OP(PSROIPooling, ngraph::op::v0)
-NGRAPH_OP(Pad, ngraph::op::v1)
-NGRAPH_OP(Parameter, ngraph::op::v0)
-NGRAPH_OP(Power, ngraph::op::v1)
-NGRAPH_OP(PriorBox, ngraph::op::v0)
-NGRAPH_OP(PriorBoxClustered, ngraph::op::v0)
-NGRAPH_OP(Proposal, ngraph::op::v0)
-NGRAPH_OP(Range, ngraph::op::v0)
-NGRAPH_OP(Relu, ngraph::op::v0)
-NGRAPH_OP(ReduceMax, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalAnd, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalOr, ngraph::op::v1)
-NGRAPH_OP(ReduceMean, ngraph::op::v1)
-NGRAPH_OP(ReduceMin, ngraph::op::v1)
-NGRAPH_OP(ReduceProd, ngraph::op::v1)
-NGRAPH_OP(ReduceSum, ngraph::op::v1)
-NGRAPH_OP(RegionYolo, ngraph::op::v0)
-
-NGRAPH_OP(ReorgYolo, ngraph::op::v0)  // Missing in opset1
-
-NGRAPH_OP(Reshape, ngraph::op::v1)
-NGRAPH_OP(Result, ngraph::op::v0)
-
-// Moved out of opset2, it was added to opset1 by mistake
-// NGRAPH_OP(Reverse, ngraph::op::v1)
-
-NGRAPH_OP(ReverseSequence, ngraph::op::v0)
-
-// Moved out of opset2, it was added to opset1 by mistake
-// NGRAPH_OP(RNNCell, ngraph::op::v0)
-
-NGRAPH_OP(ROIPooling, ngraph::op::v0)  // Missing in opset1
-
-NGRAPH_OP(Select, ngraph::op::v1)
-NGRAPH_OP(Selu, ngraph::op::v0)
-NGRAPH_OP(ShapeOf, ngraph::op::v0)
-
-// Moved out of opset2, it was added to opset1 by mistake
-// NGRAPH_OP(ShuffleChannels, ngraph::op::v0)
-
-NGRAPH_OP(Sign, ngraph::op::v0)
-NGRAPH_OP(Sigmoid, ngraph::op::v0)
-NGRAPH_OP(Sin, ngraph::op::v0)
-NGRAPH_OP(Sinh, ngraph::op::v0)
-NGRAPH_OP(Softmax, ngraph::op::v1)
-NGRAPH_OP(Sqrt, ngraph::op::v0)
-NGRAPH_OP(SpaceToDepth, ngraph::op::v0)
-NGRAPH_OP(Split, ngraph::op::v1)
-NGRAPH_OP(SquaredDifference, ngraph::op::v0)
-NGRAPH_OP(Squeeze, ngraph::op::v0)
-NGRAPH_OP(StridedSlice, ngraph::op::v1)
-NGRAPH_OP(Subtract, ngraph::op::v1)
-NGRAPH_OP(Tan, ngraph::op::v0)
-NGRAPH_OP(Tanh, ngraph::op::v0)
-NGRAPH_OP(TensorIterator, ngraph::op::v0)
-NGRAPH_OP(Tile, ngraph::op::v0)
-NGRAPH_OP(TopK, ngraph::op::v1)
-NGRAPH_OP(Transpose, ngraph::op::v1)
-NGRAPH_OP(Unsqueeze, ngraph::op::v0)
-NGRAPH_OP(VariadicSplit, ngraph::op::v1)
-
-// Moved out of opset2, it was added to opset1 by mistake
-// NGRAPH_OP(Xor, ngraph::op::v0)
-
-// New operations added in opset2
-NGRAPH_OP(Gelu, ngraph::op::v0)
-NGRAPH_OP(BatchToSpace, ngraph::op::v1)
-NGRAPH_OP(SpaceToBatch, ngraph::op::v1)
+#define OPENVINO_OP NGRAPH_OP
+#include "openvino/opsets/opset2_tbl.hpp"
+#undef OPENVINO_OP
diff --git a/ngraph/core/include/ngraph/opsets/opset3_tbl.hpp b/ngraph/core/include/ngraph/opsets/opset3_tbl.hpp
index a23d60c95f5..eccbdc2e64c 100644
--- a/ngraph/core/include/ngraph/opsets/opset3_tbl.hpp
+++ b/ngraph/core/include/ngraph/opsets/opset3_tbl.hpp
@@ -7,153 +7,6 @@
 #    define NGRAPH_OP(x, y)
 #endif
 
-NGRAPH_OP(Abs, ngraph::op::v0)
-NGRAPH_OP(Acos, ngraph::op::v0)
-NGRAPH_OP(Add, ngraph::op::v1)
-NGRAPH_OP(Asin, ngraph::op::v0)
-NGRAPH_OP(Atan, ngraph::op::v0)
-NGRAPH_OP(AvgPool, ngraph::op::v1)
-NGRAPH_OP(BatchNormInference, ngraph::op::v0)
-NGRAPH_OP(BinaryConvolution, ngraph::op::v1)
-NGRAPH_OP(Broadcast, ngraph::op::v3)
-NGRAPH_OP(Bucketize, ngraph::op::v3)
-NGRAPH_OP(CTCGreedyDecoder, ngraph::op::v0)
-NGRAPH_OP(Ceiling, ngraph::op::v0)
-NGRAPH_OP(Clamp, ngraph::op::v0)
-NGRAPH_OP(Concat, ngraph::op::v0)
-NGRAPH_OP(Constant, ngraph::op)
-NGRAPH_OP(Convert, ngraph::op::v0)
-NGRAPH_OP(ConvertLike, ngraph::op::v1)
-NGRAPH_OP(Convolution, ngraph::op::v1)
-NGRAPH_OP(ConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(Cos, ngraph::op::v0)
-NGRAPH_OP(Cosh, ngraph::op::v0)
-NGRAPH_OP(CumSum, ngraph::op::v0)
-NGRAPH_OP(DeformableConvolution, ngraph::op::v1)
-NGRAPH_OP(DeformablePSROIPooling, ngraph::op::v1)
-NGRAPH_OP(DepthToSpace, ngraph::op::v0)
-NGRAPH_OP(DetectionOutput, ngraph::op::v0)
-NGRAPH_OP(Divide, ngraph::op::v1)
-NGRAPH_OP(Elu, ngraph::op::v0)
-NGRAPH_OP(Erf, ngraph::op::v0)
-NGRAPH_OP(Equal, ngraph::op::v1)
-NGRAPH_OP(Exp, ngraph::op::v0)
-NGRAPH_OP(ExtractImagePatches, ngraph::op::v3)
-NGRAPH_OP(FakeQuantize, ngraph::op::v0)
-NGRAPH_OP(Floor, ngraph::op::v0)
-NGRAPH_OP(FloorMod, ngraph::op::v1)
-NGRAPH_OP(Gather, ngraph::op::v1)
-NGRAPH_OP(GatherTree, ngraph::op::v1)
-NGRAPH_OP(Greater, ngraph::op::v1)
-NGRAPH_OP(GreaterEqual, ngraph::op::v1)
-NGRAPH_OP(GroupConvolution, ngraph::op::v1)
-NGRAPH_OP(GroupConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(GRN, ngraph::op::v0)
-NGRAPH_OP(HardSigmoid, ngraph::op::v0)
-NGRAPH_OP(Interpolate, ngraph::op::v0)
-NGRAPH_OP(Less, ngraph::op::v1)
-NGRAPH_OP(LessEqual, ngraph::op::v1)
-NGRAPH_OP(Log, ngraph::op::v0)
-NGRAPH_OP(LogicalAnd, ngraph::op::v1)
-NGRAPH_OP(LogicalNot, ngraph::op::v1)
-NGRAPH_OP(LogicalOr, ngraph::op::v1)
-NGRAPH_OP(LogicalXor, ngraph::op::v1)
-NGRAPH_OP(LRN, ngraph::op::v0)
-NGRAPH_OP(LSTMCell, ngraph::op::v0)
-NGRAPH_OP(LSTMSequence, ngraph::op::v0)
-NGRAPH_OP(MatMul, ngraph::op::v0)
-NGRAPH_OP(MaxPool, ngraph::op::v1)
-NGRAPH_OP(Maximum, ngraph::op::v1)
-NGRAPH_OP(Minimum, ngraph::op::v1)
-NGRAPH_OP(Mod, ngraph::op::v1)
-NGRAPH_OP(Multiply, ngraph::op::v1)
-
-NGRAPH_OP(MVN, ngraph::op::v0)  // Missing in opset1
-
-NGRAPH_OP(Negative, ngraph::op::v0)
-NGRAPH_OP(NonMaxSuppression, ngraph::op::v3)
-NGRAPH_OP(NormalizeL2, ngraph::op::v0)
-NGRAPH_OP(NotEqual, ngraph::op::v1)
-NGRAPH_OP(OneHot, ngraph::op::v1)
-NGRAPH_OP(PRelu, ngraph::op::v0)
-NGRAPH_OP(PSROIPooling, ngraph::op::v0)
-NGRAPH_OP(Pad, ngraph::op::v1)
-NGRAPH_OP(Parameter, ngraph::op::v0)
-NGRAPH_OP(Power, ngraph::op::v1)
-NGRAPH_OP(PriorBox, ngraph::op::v0)
-NGRAPH_OP(PriorBoxClustered, ngraph::op::v0)
-NGRAPH_OP(Proposal, ngraph::op::v0)
-NGRAPH_OP(Range, ngraph::op::v0)
-NGRAPH_OP(Relu, ngraph::op::v0)
-NGRAPH_OP(ReduceMax, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalAnd, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalOr, ngraph::op::v1)
-NGRAPH_OP(ReduceMean, ngraph::op::v1)
-NGRAPH_OP(ReduceMin, ngraph::op::v1)
-NGRAPH_OP(ReduceProd, ngraph::op::v1)
-NGRAPH_OP(ReduceSum, ngraph::op::v1)
-NGRAPH_OP(RegionYolo, ngraph::op::v0)
-
-NGRAPH_OP(ReorgYolo, ngraph::op::v0)  // Missing in opset1
-
-NGRAPH_OP(Reshape, ngraph::op::v1)
-NGRAPH_OP(Result, ngraph::op::v0)
-
-// Moved out of opset2, it was added to opset1 by mistake
-// NGRAPH_OP(Reverse, ngraph::op::v1)
-
-NGRAPH_OP(ReverseSequence, ngraph::op::v0)
-
-// Moved out of opset2, it was added to opset1 by mistake
-// NGRAPH_OP(RNNCell, ngraph::op::v0)
-
-NGRAPH_OP(ROIPooling, ngraph::op::v0)  // Missing in opset1
-
-NGRAPH_OP(Select, ngraph::op::v1)
-NGRAPH_OP(Selu, ngraph::op::v0)
-// Superseded
-// NGRAPH_OP(ShapeOf, ngraph::op::v0)
-
-NGRAPH_OP(Sign, ngraph::op::v0)
-NGRAPH_OP(Sigmoid, ngraph::op::v0)
-NGRAPH_OP(Sin, ngraph::op::v0)
-NGRAPH_OP(Sinh, ngraph::op::v0)
-NGRAPH_OP(Softmax, ngraph::op::v1)
-NGRAPH_OP(Sqrt, ngraph::op::v0)
-NGRAPH_OP(SpaceToDepth, ngraph::op::v0)
-NGRAPH_OP(Split, ngraph::op::v1)
-NGRAPH_OP(SquaredDifference, ngraph::op::v0)
-NGRAPH_OP(Squeeze, ngraph::op::v0)
-NGRAPH_OP(StridedSlice, ngraph::op::v1)
-NGRAPH_OP(Subtract, ngraph::op::v1)
-NGRAPH_OP(Tan, ngraph::op::v0)
-NGRAPH_OP(Tanh, ngraph::op::v0)
-NGRAPH_OP(TensorIterator, ngraph::op::v0)
-NGRAPH_OP(Tile, ngraph::op::v0)
-NGRAPH_OP(Transpose, ngraph::op::v1)
-NGRAPH_OP(Unsqueeze, ngraph::op::v0)
-NGRAPH_OP(VariadicSplit, ngraph::op::v1)
-
-// Moved out of opset2, it was added to opset1 by mistake
-// NGRAPH_OP(Xor, ngraph::op::v0)
-
-// New operations added in opset2
-NGRAPH_OP(Gelu, ngraph::op::v0)
-NGRAPH_OP(BatchToSpace, ngraph::op::v1)
-NGRAPH_OP(SpaceToBatch, ngraph::op::v1)
-
-// New operations added in opset3
-NGRAPH_OP(EmbeddingBagPackedSum, ngraph::op::v3)
-NGRAPH_OP(EmbeddingSegmentsSum, ngraph::op::v3)
-NGRAPH_OP(EmbeddingBagOffsetsSum, ngraph::op::v3)
-NGRAPH_OP(GRUCell, ngraph::op::v3)
-NGRAPH_OP(NonZero, ngraph::op::v3)
-NGRAPH_OP(RNNCell, ngraph::op::v0)
-NGRAPH_OP(ROIAlign, ngraph::op::v3)
-NGRAPH_OP(ScatterElementsUpdate, ngraph::op::v3)
-NGRAPH_OP(ScatterUpdate, ngraph::op::v3)
-NGRAPH_OP(ShuffleChannels, ngraph::op::v0)
-NGRAPH_OP(ShapeOf, ngraph::op::v3)
-NGRAPH_OP(Assign, ngraph::op::v3)
-NGRAPH_OP(ReadValue, ngraph::op::v3)
-NGRAPH_OP(TopK, ngraph::op::v3)
+#define OPENVINO_OP NGRAPH_OP
+#include "openvino/opsets/opset3_tbl.hpp"
+#undef OPENVINO_OP
diff --git a/ngraph/core/include/ngraph/opsets/opset4_tbl.hpp b/ngraph/core/include/ngraph/opsets/opset4_tbl.hpp
index 23b907c1e24..70744995c9e 100644
--- a/ngraph/core/include/ngraph/opsets/opset4_tbl.hpp
+++ b/ngraph/core/include/ngraph/opsets/opset4_tbl.hpp
@@ -7,146 +7,6 @@
 #    define NGRAPH_OP(x, y)
 #endif
 
-NGRAPH_OP(Abs, ngraph::op::v0)
-NGRAPH_OP(Acos, ngraph::op::v0)
-NGRAPH_OP(Add, ngraph::op::v1)
-NGRAPH_OP(Asin, ngraph::op::v0)
-NGRAPH_OP(Atan, ngraph::op::v0)
-NGRAPH_OP(AvgPool, ngraph::op::v1)
-NGRAPH_OP(BatchNormInference, ngraph::op::v0)
-NGRAPH_OP(BinaryConvolution, ngraph::op::v1)
-NGRAPH_OP(Broadcast, ngraph::op::v3)
-NGRAPH_OP(Bucketize, ngraph::op::v3)
-NGRAPH_OP(CTCGreedyDecoder, ngraph::op::v0)
-NGRAPH_OP(Ceiling, ngraph::op::v0)
-NGRAPH_OP(Clamp, ngraph::op::v0)
-NGRAPH_OP(Concat, ngraph::op::v0)
-NGRAPH_OP(Constant, ngraph::op)
-NGRAPH_OP(Convert, ngraph::op::v0)
-NGRAPH_OP(ConvertLike, ngraph::op::v1)
-NGRAPH_OP(Convolution, ngraph::op::v1)
-NGRAPH_OP(ConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(Cos, ngraph::op::v0)
-NGRAPH_OP(Cosh, ngraph::op::v0)
-NGRAPH_OP(CumSum, ngraph::op::v0)
-NGRAPH_OP(DeformableConvolution, ngraph::op::v1)
-NGRAPH_OP(DeformablePSROIPooling, ngraph::op::v1)
-NGRAPH_OP(DepthToSpace, ngraph::op::v0)
-NGRAPH_OP(DetectionOutput, ngraph::op::v0)
-NGRAPH_OP(Divide, ngraph::op::v1)
-NGRAPH_OP(Elu, ngraph::op::v0)
-NGRAPH_OP(Erf, ngraph::op::v0)
-NGRAPH_OP(Equal, ngraph::op::v1)
-NGRAPH_OP(Exp, ngraph::op::v0)
-NGRAPH_OP(ExtractImagePatches, ngraph::op::v3)
-NGRAPH_OP(FakeQuantize, ngraph::op::v0)
-NGRAPH_OP(Floor, ngraph::op::v0)
-NGRAPH_OP(FloorMod, ngraph::op::v1)
-NGRAPH_OP(Gather, ngraph::op::v1)
-NGRAPH_OP(GatherTree, ngraph::op::v1)
-NGRAPH_OP(Greater, ngraph::op::v1)
-NGRAPH_OP(GreaterEqual, ngraph::op::v1)
-NGRAPH_OP(GroupConvolution, ngraph::op::v1)
-NGRAPH_OP(GroupConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(GRN, ngraph::op::v0)
-NGRAPH_OP(HardSigmoid, ngraph::op::v0)
-NGRAPH_OP(Less, ngraph::op::v1)
-NGRAPH_OP(LessEqual, ngraph::op::v1)
-NGRAPH_OP(Log, ngraph::op::v0)
-NGRAPH_OP(LogicalAnd, ngraph::op::v1)
-NGRAPH_OP(LogicalNot, ngraph::op::v1)
-NGRAPH_OP(LogicalOr, ngraph::op::v1)
-NGRAPH_OP(LogicalXor, ngraph::op::v1)
-NGRAPH_OP(LRN, ngraph::op::v0)
-NGRAPH_OP(LSTMCell, ngraph::op::v4)
-NGRAPH_OP(MatMul, ngraph::op::v0)
-NGRAPH_OP(MaxPool, ngraph::op::v1)
-NGRAPH_OP(Maximum, ngraph::op::v1)
-NGRAPH_OP(Minimum, ngraph::op::v1)
-NGRAPH_OP(Mod, ngraph::op::v1)
-NGRAPH_OP(Multiply, ngraph::op::v1)
-NGRAPH_OP(MVN, ngraph::op::v0)
-NGRAPH_OP(Negative, ngraph::op::v0)
-NGRAPH_OP(NormalizeL2, ngraph::op::v0)
-NGRAPH_OP(NotEqual, ngraph::op::v1)
-NGRAPH_OP(OneHot, ngraph::op::v1)
-NGRAPH_OP(PRelu, ngraph::op::v0)
-NGRAPH_OP(PSROIPooling, ngraph::op::v0)
-NGRAPH_OP(Pad, ngraph::op::v1)
-NGRAPH_OP(Parameter, ngraph::op::v0)
-NGRAPH_OP(Power, ngraph::op::v1)
-NGRAPH_OP(PriorBox, ngraph::op::v0)
-NGRAPH_OP(PriorBoxClustered, ngraph::op::v0)
-NGRAPH_OP(Proposal, ngraph::op::v4)
-NGRAPH_OP(Range, ngraph::op::v4)
-NGRAPH_OP(Relu, ngraph::op::v0)
-NGRAPH_OP(ReduceMax, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalAnd, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalOr, ngraph::op::v1)
-NGRAPH_OP(ReduceMean, ngraph::op::v1)
-NGRAPH_OP(ReduceMin, ngraph::op::v1)
-NGRAPH_OP(ReduceProd, ngraph::op::v1)
-NGRAPH_OP(ReduceSum, ngraph::op::v1)
-NGRAPH_OP(RegionYolo, ngraph::op::v0)
-NGRAPH_OP(ReorgYolo, ngraph::op::v0)
-NGRAPH_OP(Reshape, ngraph::op::v1)
-NGRAPH_OP(Result, ngraph::op::v0)
-NGRAPH_OP(ReverseSequence, ngraph::op::v0)
-NGRAPH_OP(ROIPooling, ngraph::op::v0)
-NGRAPH_OP(ScatterNDUpdate, ngraph::op::v3)
-NGRAPH_OP(Select, ngraph::op::v1)
-NGRAPH_OP(Selu, ngraph::op::v0)
-NGRAPH_OP(Sign, ngraph::op::v0)
-NGRAPH_OP(Sigmoid, ngraph::op::v0)
-NGRAPH_OP(Sin, ngraph::op::v0)
-NGRAPH_OP(Sinh, ngraph::op::v0)
-NGRAPH_OP(Softmax, ngraph::op::v1)
-NGRAPH_OP(Sqrt, ngraph::op::v0)
-NGRAPH_OP(SpaceToDepth, ngraph::op::v0)
-NGRAPH_OP(Split, ngraph::op::v1)
-NGRAPH_OP(SquaredDifference, ngraph::op::v0)
-NGRAPH_OP(Squeeze, ngraph::op::v0)
-NGRAPH_OP(StridedSlice, ngraph::op::v1)
-NGRAPH_OP(Subtract, ngraph::op::v1)
-NGRAPH_OP(Tan, ngraph::op::v0)
-NGRAPH_OP(Tanh, ngraph::op::v0)
-NGRAPH_OP(TensorIterator, ngraph::op::v0)
-NGRAPH_OP(Tile, ngraph::op::v0)
-NGRAPH_OP(Transpose, ngraph::op::v1)
-NGRAPH_OP(Unsqueeze, ngraph::op::v0)
-NGRAPH_OP(VariadicSplit, ngraph::op::v1)
-
-// New operations added in opset2
-NGRAPH_OP(Gelu, ngraph::op::v0)
-NGRAPH_OP(BatchToSpace, ngraph::op::v1)
-NGRAPH_OP(SpaceToBatch, ngraph::op::v1)
-
-// New operations added in opset3
-NGRAPH_OP(EmbeddingBagPackedSum, ngraph::op::v3)
-NGRAPH_OP(EmbeddingSegmentsSum, ngraph::op::v3)
-NGRAPH_OP(EmbeddingBagOffsetsSum, ngraph::op::v3)
-NGRAPH_OP(GRUCell, ngraph::op::v3)
-NGRAPH_OP(NonZero, ngraph::op::v3)
-NGRAPH_OP(RNNCell, ngraph::op::v0)
-NGRAPH_OP(ROIAlign, ngraph::op::v3)
-NGRAPH_OP(ScatterElementsUpdate, ngraph::op::v3)
-NGRAPH_OP(ScatterUpdate, ngraph::op::v3)
-NGRAPH_OP(ShuffleChannels, ngraph::op::v0)
-NGRAPH_OP(ShapeOf, ngraph::op::v3)
-NGRAPH_OP(Assign, ngraph::op::v3)
-NGRAPH_OP(ReadValue, ngraph::op::v3)
-NGRAPH_OP(TopK, ngraph::op::v3)
-
-// New operations added in opset4
-NGRAPH_OP(Acosh, ngraph::op::v3)
-NGRAPH_OP(Asinh, ngraph::op::v3)
-NGRAPH_OP(Atanh, ngraph::op::v3)
-NGRAPH_OP(CTCLoss, ngraph::op::v4)
-NGRAPH_OP(HSwish, ngraph::op::v4)
-NGRAPH_OP(Interpolate, ngraph::op::v4)
-NGRAPH_OP(Mish, ngraph::op::v4)
-NGRAPH_OP(NonMaxSuppression, ngraph::op::v4)
-NGRAPH_OP(ReduceL1, ngraph::op::v4)
-NGRAPH_OP(ReduceL2, ngraph::op::v4)
-NGRAPH_OP(SoftPlus, ngraph::op::v4)
-NGRAPH_OP(Swish, ngraph::op::v4)
+#define OPENVINO_OP NGRAPH_OP
+#include "openvino/opsets/opset4_tbl.hpp"
+#undef OPENVINO_OP
diff --git a/ngraph/core/include/ngraph/opsets/opset5_tbl.hpp b/ngraph/core/include/ngraph/opsets/opset5_tbl.hpp
index 3f81f851358..2e4b6ad7288 100644
--- a/ngraph/core/include/ngraph/opsets/opset5_tbl.hpp
+++ b/ngraph/core/include/ngraph/opsets/opset5_tbl.hpp
@@ -7,156 +7,6 @@
 #    define NGRAPH_OP(x, y)
 #endif
 
-NGRAPH_OP(Abs, ngraph::op::v0)
-NGRAPH_OP(Acos, ngraph::op::v0)
-NGRAPH_OP(Add, ngraph::op::v1)
-NGRAPH_OP(Asin, ngraph::op::v0)
-NGRAPH_OP(Atan, ngraph::op::v0)
-NGRAPH_OP(AvgPool, ngraph::op::v1)
-NGRAPH_OP(BatchNormInference, ngraph::op::v5)
-NGRAPH_OP(BinaryConvolution, ngraph::op::v1)
-NGRAPH_OP(Broadcast, ngraph::op::v3)
-NGRAPH_OP(Bucketize, ngraph::op::v3)
-NGRAPH_OP(CTCGreedyDecoder, ngraph::op::v0)
-NGRAPH_OP(Ceiling, ngraph::op::v0)
-NGRAPH_OP(Clamp, ngraph::op::v0)
-NGRAPH_OP(Concat, ngraph::op::v0)
-NGRAPH_OP(Constant, ngraph::op)
-NGRAPH_OP(Convert, ngraph::op::v0)
-NGRAPH_OP(ConvertLike, ngraph::op::v1)
-NGRAPH_OP(Convolution, ngraph::op::v1)
-NGRAPH_OP(ConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(Cos, ngraph::op::v0)
-NGRAPH_OP(Cosh, ngraph::op::v0)
-NGRAPH_OP(CumSum, ngraph::op::v0)
-NGRAPH_OP(DeformableConvolution, ngraph::op::v1)
-NGRAPH_OP(DeformablePSROIPooling, ngraph::op::v1)
-NGRAPH_OP(DepthToSpace, ngraph::op::v0)
-NGRAPH_OP(DetectionOutput, ngraph::op::v0)
-NGRAPH_OP(Divide, ngraph::op::v1)
-NGRAPH_OP(Elu, ngraph::op::v0)
-NGRAPH_OP(Erf, ngraph::op::v0)
-NGRAPH_OP(Equal, ngraph::op::v1)
-NGRAPH_OP(Exp, ngraph::op::v0)
-NGRAPH_OP(ExtractImagePatches, ngraph::op::v3)
-NGRAPH_OP(FakeQuantize, ngraph::op::v0)
-NGRAPH_OP(Floor, ngraph::op::v0)
-NGRAPH_OP(FloorMod, ngraph::op::v1)
-NGRAPH_OP(Gather, ngraph::op::v1)
-NGRAPH_OP(GatherTree, ngraph::op::v1)
-NGRAPH_OP(Greater, ngraph::op::v1)
-NGRAPH_OP(GreaterEqual, ngraph::op::v1)
-NGRAPH_OP(GroupConvolution, ngraph::op::v1)
-NGRAPH_OP(GroupConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(GRN, ngraph::op::v0)
-NGRAPH_OP(HardSigmoid, ngraph::op::v0)
-NGRAPH_OP(Less, ngraph::op::v1)
-NGRAPH_OP(LessEqual, ngraph::op::v1)
-NGRAPH_OP(Log, ngraph::op::v0)
-NGRAPH_OP(LogicalAnd, ngraph::op::v1)
-NGRAPH_OP(LogicalNot, ngraph::op::v1)
-NGRAPH_OP(LogicalOr, ngraph::op::v1)
-NGRAPH_OP(LogicalXor, ngraph::op::v1)
-NGRAPH_OP(LRN, ngraph::op::v0)
-NGRAPH_OP(LSTMCell, ngraph::op::v4)
-NGRAPH_OP(MatMul, ngraph::op::v0)
-NGRAPH_OP(MaxPool, ngraph::op::v1)
-NGRAPH_OP(Maximum, ngraph::op::v1)
-NGRAPH_OP(Minimum, ngraph::op::v1)
-NGRAPH_OP(Mod, ngraph::op::v1)
-NGRAPH_OP(Multiply, ngraph::op::v1)
-NGRAPH_OP(MVN, ngraph::op::v0)
-NGRAPH_OP(Negative, ngraph::op::v0)
-NGRAPH_OP(NormalizeL2, ngraph::op::v0)
-NGRAPH_OP(NotEqual, ngraph::op::v1)
-NGRAPH_OP(OneHot, ngraph::op::v1)
-NGRAPH_OP(PRelu, ngraph::op::v0)
-NGRAPH_OP(PSROIPooling, ngraph::op::v0)
-NGRAPH_OP(Pad, ngraph::op::v1)
-NGRAPH_OP(Parameter, ngraph::op::v0)
-NGRAPH_OP(Power, ngraph::op::v1)
-NGRAPH_OP(PriorBox, ngraph::op::v0)
-NGRAPH_OP(PriorBoxClustered, ngraph::op::v0)
-NGRAPH_OP(Proposal, ngraph::op::v4)
-NGRAPH_OP(Range, ngraph::op::v4)
-NGRAPH_OP(Relu, ngraph::op::v0)
-NGRAPH_OP(ReduceMax, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalAnd, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalOr, ngraph::op::v1)
-NGRAPH_OP(ReduceMean, ngraph::op::v1)
-NGRAPH_OP(ReduceMin, ngraph::op::v1)
-NGRAPH_OP(ReduceProd, ngraph::op::v1)
-NGRAPH_OP(ReduceSum, ngraph::op::v1)
-NGRAPH_OP(RegionYolo, ngraph::op::v0)
-NGRAPH_OP(ReorgYolo, ngraph::op::v0)
-NGRAPH_OP(Reshape, ngraph::op::v1)
-NGRAPH_OP(Result, ngraph::op::v0)
-NGRAPH_OP(ReverseSequence, ngraph::op::v0)
-NGRAPH_OP(ROIPooling, ngraph::op::v0)
-NGRAPH_OP(ScatterNDUpdate, ngraph::op::v3)
-NGRAPH_OP(Select, ngraph::op::v1)
-NGRAPH_OP(Selu, ngraph::op::v0)
-NGRAPH_OP(Sign, ngraph::op::v0)
-NGRAPH_OP(Sigmoid, ngraph::op::v0)
-NGRAPH_OP(Sin, ngraph::op::v0)
-NGRAPH_OP(Sinh, ngraph::op::v0)
-NGRAPH_OP(Softmax, ngraph::op::v1)
-NGRAPH_OP(Sqrt, ngraph::op::v0)
-NGRAPH_OP(SpaceToDepth, ngraph::op::v0)
-NGRAPH_OP(Split, ngraph::op::v1)
-NGRAPH_OP(SquaredDifference, ngraph::op::v0)
-NGRAPH_OP(Squeeze, ngraph::op::v0)
-NGRAPH_OP(StridedSlice, ngraph::op::v1)
-NGRAPH_OP(Subtract, ngraph::op::v1)
-NGRAPH_OP(Tan, ngraph::op::v0)
-NGRAPH_OP(Tanh, ngraph::op::v0)
-NGRAPH_OP(TensorIterator, ngraph::op::v0)
-NGRAPH_OP(Tile, ngraph::op::v0)
-NGRAPH_OP(Transpose, ngraph::op::v1)
-NGRAPH_OP(Unsqueeze, ngraph::op::v0)
-NGRAPH_OP(VariadicSplit, ngraph::op::v1)
-
-// New operations added in opset2
-NGRAPH_OP(Gelu, ngraph::op::v0)
-NGRAPH_OP(BatchToSpace, ngraph::op::v1)
-NGRAPH_OP(SpaceToBatch, ngraph::op::v1)
-
-// New operations added in opset3
-NGRAPH_OP(EmbeddingBagPackedSum, ngraph::op::v3)
-NGRAPH_OP(EmbeddingSegmentsSum, ngraph::op::v3)
-NGRAPH_OP(EmbeddingBagOffsetsSum, ngraph::op::v3)
-NGRAPH_OP(GRUCell, ngraph::op::v3)
-NGRAPH_OP(NonZero, ngraph::op::v3)
-NGRAPH_OP(RNNCell, ngraph::op::v0)
-NGRAPH_OP(ROIAlign, ngraph::op::v3)
-NGRAPH_OP(ScatterElementsUpdate, ngraph::op::v3)
-NGRAPH_OP(ScatterUpdate, ngraph::op::v3)
-NGRAPH_OP(ShuffleChannels, ngraph::op::v0)
-NGRAPH_OP(ShapeOf, ngraph::op::v3)
-NGRAPH_OP(Assign, ngraph::op::v3)
-NGRAPH_OP(ReadValue, ngraph::op::v3)
-NGRAPH_OP(TopK, ngraph::op::v3)
-
-// New operations added in opset4
-NGRAPH_OP(Acosh, ngraph::op::v3)
-NGRAPH_OP(Asinh, ngraph::op::v3)
-NGRAPH_OP(Atanh, ngraph::op::v3)
-NGRAPH_OP(CTCLoss, ngraph::op::v4)
-NGRAPH_OP(HSwish, ngraph::op::v4)
-NGRAPH_OP(Interpolate, ngraph::op::v4)
-NGRAPH_OP(Mish, ngraph::op::v4)
-NGRAPH_OP(ReduceL1, ngraph::op::v4)
-NGRAPH_OP(ReduceL2, ngraph::op::v4)
-NGRAPH_OP(SoftPlus, ngraph::op::v4)
-NGRAPH_OP(Swish, ngraph::op::v4)
-
-// New operations added in opset5
-NGRAPH_OP(GatherND, ngraph::op::v5)
-NGRAPH_OP(GRUSequence, ngraph::op::v5)
-NGRAPH_OP(HSigmoid, ngraph::op::v5)
-NGRAPH_OP(LogSoftmax, ngraph::op::v5)
-NGRAPH_OP(Loop, ngraph::op::v5)
-NGRAPH_OP(LSTMSequence, ngraph::op::v5)
-NGRAPH_OP(NonMaxSuppression, ngraph::op::v5)
-NGRAPH_OP(RNNSequence, ngraph::op::v5)
-NGRAPH_OP(Round, ngraph::op::v5)
+#define OPENVINO_OP NGRAPH_OP
+#include "openvino/opsets/opset5_tbl.hpp"
+#undef OPENVINO_OP
diff --git a/ngraph/core/include/ngraph/opsets/opset6_tbl.hpp b/ngraph/core/include/ngraph/opsets/opset6_tbl.hpp
index d188304b53c..e9cb2a0c12a 100644
--- a/ngraph/core/include/ngraph/opsets/opset6_tbl.hpp
+++ b/ngraph/core/include/ngraph/opsets/opset6_tbl.hpp
@@ -7,165 +7,6 @@
 #    define NGRAPH_OP(x, y)
 #endif
 
-NGRAPH_OP(Abs, ngraph::op::v0)
-NGRAPH_OP(Acos, ngraph::op::v0)
-NGRAPH_OP(Add, ngraph::op::v1)
-NGRAPH_OP(Asin, ngraph::op::v0)
-NGRAPH_OP(Atan, ngraph::op::v0)
-NGRAPH_OP(AvgPool, ngraph::op::v1)
-NGRAPH_OP(BatchNormInference, ngraph::op::v5)
-NGRAPH_OP(BinaryConvolution, ngraph::op::v1)
-NGRAPH_OP(Broadcast, ngraph::op::v3)
-NGRAPH_OP(Bucketize, ngraph::op::v3)
-NGRAPH_OP(CTCGreedyDecoder, ngraph::op::v0)
-NGRAPH_OP(Ceiling, ngraph::op::v0)
-NGRAPH_OP(Clamp, ngraph::op::v0)
-NGRAPH_OP(Concat, ngraph::op::v0)
-NGRAPH_OP(Constant, ngraph::op)
-NGRAPH_OP(Convert, ngraph::op::v0)
-NGRAPH_OP(ConvertLike, ngraph::op::v1)
-NGRAPH_OP(Convolution, ngraph::op::v1)
-NGRAPH_OP(ConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(Cos, ngraph::op::v0)
-NGRAPH_OP(Cosh, ngraph::op::v0)
-NGRAPH_OP(CumSum, ngraph::op::v0)
-NGRAPH_OP(DeformableConvolution, ngraph::op::v1)
-NGRAPH_OP(DeformablePSROIPooling, ngraph::op::v1)
-NGRAPH_OP(DepthToSpace, ngraph::op::v0)
-NGRAPH_OP(DetectionOutput, ngraph::op::v0)
-NGRAPH_OP(Divide, ngraph::op::v1)
-NGRAPH_OP(Elu, ngraph::op::v0)
-NGRAPH_OP(Erf, ngraph::op::v0)
-NGRAPH_OP(Equal, ngraph::op::v1)
-NGRAPH_OP(Exp, ngraph::op::v0)
-NGRAPH_OP(ExtractImagePatches, ngraph::op::v3)
-NGRAPH_OP(FakeQuantize, ngraph::op::v0)
-NGRAPH_OP(Floor, ngraph::op::v0)
-NGRAPH_OP(FloorMod, ngraph::op::v1)
-NGRAPH_OP(Gather, ngraph::op::v1)
-NGRAPH_OP(GatherTree, ngraph::op::v1)
-NGRAPH_OP(Greater, ngraph::op::v1)
-NGRAPH_OP(GreaterEqual, ngraph::op::v1)
-NGRAPH_OP(GroupConvolution, ngraph::op::v1)
-NGRAPH_OP(GroupConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(GRN, ngraph::op::v0)
-NGRAPH_OP(HardSigmoid, ngraph::op::v0)
-NGRAPH_OP(Less, ngraph::op::v1)
-NGRAPH_OP(LessEqual, ngraph::op::v1)
-NGRAPH_OP(Log, ngraph::op::v0)
-NGRAPH_OP(LogicalAnd, ngraph::op::v1)
-NGRAPH_OP(LogicalNot, ngraph::op::v1)
-NGRAPH_OP(LogicalOr, ngraph::op::v1)
-NGRAPH_OP(LogicalXor, ngraph::op::v1)
-NGRAPH_OP(LRN, ngraph::op::v0)
-NGRAPH_OP(LSTMCell, ngraph::op::v4)
-NGRAPH_OP(MatMul, ngraph::op::v0)
-NGRAPH_OP(MaxPool, ngraph::op::v1)
-NGRAPH_OP(Maximum, ngraph::op::v1)
-NGRAPH_OP(Minimum, ngraph::op::v1)
-NGRAPH_OP(Mod, ngraph::op::v1)
-NGRAPH_OP(Multiply, ngraph::op::v1)
-NGRAPH_OP(Negative, ngraph::op::v0)
-NGRAPH_OP(NormalizeL2, ngraph::op::v0)
-NGRAPH_OP(NotEqual, ngraph::op::v1)
-NGRAPH_OP(OneHot, ngraph::op::v1)
-NGRAPH_OP(PRelu, ngraph::op::v0)
-NGRAPH_OP(PSROIPooling, ngraph::op::v0)
-NGRAPH_OP(Pad, ngraph::op::v1)
-NGRAPH_OP(Parameter, ngraph::op::v0)
-NGRAPH_OP(Power, ngraph::op::v1)
-NGRAPH_OP(PriorBox, ngraph::op::v0)
-NGRAPH_OP(PriorBoxClustered, ngraph::op::v0)
-NGRAPH_OP(Proposal, ngraph::op::v4)
-NGRAPH_OP(Range, ngraph::op::v4)
-NGRAPH_OP(Relu, ngraph::op::v0)
-NGRAPH_OP(ReduceMax, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalAnd, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalOr, ngraph::op::v1)
-NGRAPH_OP(ReduceMean, ngraph::op::v1)
-NGRAPH_OP(ReduceMin, ngraph::op::v1)
-NGRAPH_OP(ReduceProd, ngraph::op::v1)
-NGRAPH_OP(ReduceSum, ngraph::op::v1)
-NGRAPH_OP(RegionYolo, ngraph::op::v0)
-NGRAPH_OP(ReorgYolo, ngraph::op::v0)
-NGRAPH_OP(Reshape, ngraph::op::v1)
-NGRAPH_OP(Result, ngraph::op::v0)
-NGRAPH_OP(ReverseSequence, ngraph::op::v0)
-NGRAPH_OP(ROIPooling, ngraph::op::v0)
-NGRAPH_OP(ScatterNDUpdate, ngraph::op::v3)
-NGRAPH_OP(Select, ngraph::op::v1)
-NGRAPH_OP(Selu, ngraph::op::v0)
-NGRAPH_OP(Sign, ngraph::op::v0)
-NGRAPH_OP(Sigmoid, ngraph::op::v0)
-NGRAPH_OP(Sin, ngraph::op::v0)
-NGRAPH_OP(Sinh, ngraph::op::v0)
-NGRAPH_OP(Softmax, ngraph::op::v1)
-NGRAPH_OP(Sqrt, ngraph::op::v0)
-NGRAPH_OP(SpaceToDepth, ngraph::op::v0)
-NGRAPH_OP(Split, ngraph::op::v1)
-NGRAPH_OP(SquaredDifference, ngraph::op::v0)
-NGRAPH_OP(Squeeze, ngraph::op::v0)
-NGRAPH_OP(StridedSlice, ngraph::op::v1)
-NGRAPH_OP(Subtract, ngraph::op::v1)
-NGRAPH_OP(Tan, ngraph::op::v0)
-NGRAPH_OP(Tanh, ngraph::op::v0)
-NGRAPH_OP(TensorIterator, ngraph::op::v0)
-NGRAPH_OP(Tile, ngraph::op::v0)
-NGRAPH_OP(Transpose, ngraph::op::v1)
-NGRAPH_OP(Unsqueeze, ngraph::op::v0)
-NGRAPH_OP(VariadicSplit, ngraph::op::v1)
-
-// New operations added in opset2
-NGRAPH_OP(Gelu, ngraph::op::v0)
-NGRAPH_OP(BatchToSpace, ngraph::op::v1)
-NGRAPH_OP(SpaceToBatch, ngraph::op::v1)
-
-// New operations added in opset3
-NGRAPH_OP(EmbeddingBagPackedSum, ngraph::op::v3)
-NGRAPH_OP(EmbeddingSegmentsSum, ngraph::op::v3)
-NGRAPH_OP(EmbeddingBagOffsetsSum, ngraph::op::v3)
-NGRAPH_OP(GRUCell, ngraph::op::v3)
-NGRAPH_OP(NonZero, ngraph::op::v3)
-NGRAPH_OP(RNNCell, ngraph::op::v0)
-NGRAPH_OP(ROIAlign, ngraph::op::v3)
-NGRAPH_OP(ScatterElementsUpdate, ngraph::op::v3)
-NGRAPH_OP(ScatterUpdate, ngraph::op::v3)
-NGRAPH_OP(ShuffleChannels, ngraph::op::v0)
-NGRAPH_OP(ShapeOf, ngraph::op::v3)
-NGRAPH_OP(TopK, ngraph::op::v3)
-
-// New operations added in opset4
-NGRAPH_OP(Acosh, ngraph::op::v3)
-NGRAPH_OP(Asinh, ngraph::op::v3)
-NGRAPH_OP(Atanh, ngraph::op::v3)
-NGRAPH_OP(CTCLoss, ngraph::op::v4)
-NGRAPH_OP(HSwish, ngraph::op::v4)
-NGRAPH_OP(Interpolate, ngraph::op::v4)
-NGRAPH_OP(Mish, ngraph::op::v4)
-NGRAPH_OP(ReduceL1, ngraph::op::v4)
-NGRAPH_OP(ReduceL2, ngraph::op::v4)
-NGRAPH_OP(SoftPlus, ngraph::op::v4)
-NGRAPH_OP(Swish, ngraph::op::v4)
-
-// New operations added in opset5
-NGRAPH_OP(GatherND, ngraph::op::v5)
-NGRAPH_OP(GRUSequence, ngraph::op::v5)
-NGRAPH_OP(HSigmoid, ngraph::op::v5)
-NGRAPH_OP(LogSoftmax, ngraph::op::v5)
-NGRAPH_OP(Loop, ngraph::op::v5)
-NGRAPH_OP(LSTMSequence, ngraph::op::v5)
-NGRAPH_OP(NonMaxSuppression, ngraph::op::v5)
-NGRAPH_OP(RNNSequence, ngraph::op::v5)
-NGRAPH_OP(Round, ngraph::op::v5)
-
-// New operations added in opset6
-NGRAPH_OP(CTCGreedyDecoderSeqLen, ngraph::op::v6)
-NGRAPH_OP(ExperimentalDetectronDetectionOutput, ngraph::op::v6)
-NGRAPH_OP(ExperimentalDetectronGenerateProposalsSingleImage, ngraph::op::v6)
-NGRAPH_OP(ExperimentalDetectronPriorGridGenerator, ngraph::op::v6)
-NGRAPH_OP(ExperimentalDetectronROIFeatureExtractor, ngraph::op::v6)
-NGRAPH_OP(ExperimentalDetectronTopKROIs, ngraph::op::v6)
-NGRAPH_OP(GatherElements, ngraph::op::v6)
-NGRAPH_OP(MVN, ngraph::op::v6)
-NGRAPH_OP(Assign, ngraph::op::v6)     // new version
-NGRAPH_OP(ReadValue, ngraph::op::v6)  // new version
+#define OPENVINO_OP NGRAPH_OP
+#include "openvino/opsets/opset6_tbl.hpp"
+#undef OPENVINO_OP
diff --git a/ngraph/core/include/ngraph/opsets/opset7_tbl.hpp b/ngraph/core/include/ngraph/opsets/opset7_tbl.hpp
index 38ffbd373aa..02802da1b94 100644
--- a/ngraph/core/include/ngraph/opsets/opset7_tbl.hpp
+++ b/ngraph/core/include/ngraph/opsets/opset7_tbl.hpp
@@ -7,171 +7,6 @@
 #    define NGRAPH_OP(x, y)
 #endif
 
-NGRAPH_OP(Abs, ngraph::op::v0)
-NGRAPH_OP(Acos, ngraph::op::v0)
-NGRAPH_OP(Add, ngraph::op::v1)
-NGRAPH_OP(Asin, ngraph::op::v0)
-NGRAPH_OP(Atan, ngraph::op::v0)
-NGRAPH_OP(AvgPool, ngraph::op::v1)
-NGRAPH_OP(BatchNormInference, ngraph::op::v5)
-NGRAPH_OP(BinaryConvolution, ngraph::op::v1)
-NGRAPH_OP(Broadcast, ngraph::op::v3)
-NGRAPH_OP(Bucketize, ngraph::op::v3)
-NGRAPH_OP(CTCGreedyDecoder, ngraph::op::v0)
-NGRAPH_OP(Ceiling, ngraph::op::v0)
-NGRAPH_OP(Clamp, ngraph::op::v0)
-NGRAPH_OP(Concat, ngraph::op::v0)
-NGRAPH_OP(Constant, ngraph::op)
-NGRAPH_OP(Convert, ngraph::op::v0)
-NGRAPH_OP(ConvertLike, ngraph::op::v1)
-NGRAPH_OP(Convolution, ngraph::op::v1)
-NGRAPH_OP(ConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(Cos, ngraph::op::v0)
-NGRAPH_OP(Cosh, ngraph::op::v0)
-NGRAPH_OP(CumSum, ngraph::op::v0)
-NGRAPH_OP(DeformableConvolution, ngraph::op::v1)
-NGRAPH_OP(DeformablePSROIPooling, ngraph::op::v1)
-NGRAPH_OP(DepthToSpace, ngraph::op::v0)
-NGRAPH_OP(DetectionOutput, ngraph::op::v0)
-NGRAPH_OP(Divide, ngraph::op::v1)
-NGRAPH_OP(Elu, ngraph::op::v0)
-NGRAPH_OP(Erf, ngraph::op::v0)
-NGRAPH_OP(Equal, ngraph::op::v1)
-NGRAPH_OP(Exp, ngraph::op::v0)
-NGRAPH_OP(ExtractImagePatches, ngraph::op::v3)
-NGRAPH_OP(FakeQuantize, ngraph::op::v0)
-NGRAPH_OP(Floor, ngraph::op::v0)
-NGRAPH_OP(FloorMod, ngraph::op::v1)
-NGRAPH_OP(Gather, ngraph::op::v7)
-NGRAPH_OP(GatherTree, ngraph::op::v1)
-NGRAPH_OP(Greater, ngraph::op::v1)
-NGRAPH_OP(GreaterEqual, ngraph::op::v1)
-NGRAPH_OP(GroupConvolution, ngraph::op::v1)
-NGRAPH_OP(GroupConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(GRN, ngraph::op::v0)
-NGRAPH_OP(HardSigmoid, ngraph::op::v0)
-NGRAPH_OP(Less, ngraph::op::v1)
-NGRAPH_OP(LessEqual, ngraph::op::v1)
-NGRAPH_OP(Log, ngraph::op::v0)
-NGRAPH_OP(LogicalAnd, ngraph::op::v1)
-NGRAPH_OP(LogicalNot, ngraph::op::v1)
-NGRAPH_OP(LogicalOr, ngraph::op::v1)
-NGRAPH_OP(LogicalXor, ngraph::op::v1)
-NGRAPH_OP(LRN, ngraph::op::v0)
-NGRAPH_OP(LSTMCell, ngraph::op::v4)
-NGRAPH_OP(MatMul, ngraph::op::v0)
-NGRAPH_OP(MaxPool, ngraph::op::v1)
-NGRAPH_OP(Maximum, ngraph::op::v1)
-NGRAPH_OP(Minimum, ngraph::op::v1)
-NGRAPH_OP(Mod, ngraph::op::v1)
-NGRAPH_OP(Multiply, ngraph::op::v1)
-NGRAPH_OP(Negative, ngraph::op::v0)
-NGRAPH_OP(NormalizeL2, ngraph::op::v0)
-NGRAPH_OP(NotEqual, ngraph::op::v1)
-NGRAPH_OP(OneHot, ngraph::op::v1)
-NGRAPH_OP(PRelu, ngraph::op::v0)
-NGRAPH_OP(PSROIPooling, ngraph::op::v0)
-NGRAPH_OP(Pad, ngraph::op::v1)
-NGRAPH_OP(Parameter, ngraph::op::v0)
-NGRAPH_OP(Power, ngraph::op::v1)
-NGRAPH_OP(PriorBox, ngraph::op::v0)
-NGRAPH_OP(PriorBoxClustered, ngraph::op::v0)
-NGRAPH_OP(Proposal, ngraph::op::v4)
-NGRAPH_OP(Range, ngraph::op::v4)
-NGRAPH_OP(Relu, ngraph::op::v0)
-NGRAPH_OP(ReduceMax, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalAnd, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalOr, ngraph::op::v1)
-NGRAPH_OP(ReduceMean, ngraph::op::v1)
-NGRAPH_OP(ReduceMin, ngraph::op::v1)
-NGRAPH_OP(ReduceProd, ngraph::op::v1)
-NGRAPH_OP(ReduceSum, ngraph::op::v1)
-NGRAPH_OP(RegionYolo, ngraph::op::v0)
-NGRAPH_OP(ReorgYolo, ngraph::op::v0)
-NGRAPH_OP(Reshape, ngraph::op::v1)
-NGRAPH_OP(Result, ngraph::op::v0)
-NGRAPH_OP(ReverseSequence, ngraph::op::v0)
-NGRAPH_OP(ROIPooling, ngraph::op::v0)
-NGRAPH_OP(ScatterNDUpdate, ngraph::op::v3)
-NGRAPH_OP(Select, ngraph::op::v1)
-NGRAPH_OP(Selu, ngraph::op::v0)
-NGRAPH_OP(Sign, ngraph::op::v0)
-NGRAPH_OP(Sigmoid, ngraph::op::v0)
-NGRAPH_OP(Sin, ngraph::op::v0)
-NGRAPH_OP(Sinh, ngraph::op::v0)
-NGRAPH_OP(Softmax, ngraph::op::v1)
-NGRAPH_OP(Sqrt, ngraph::op::v0)
-NGRAPH_OP(SpaceToDepth, ngraph::op::v0)
-NGRAPH_OP(Split, ngraph::op::v1)
-NGRAPH_OP(SquaredDifference, ngraph::op::v0)
-NGRAPH_OP(Squeeze, ngraph::op::v0)
-NGRAPH_OP(StridedSlice, ngraph::op::v1)
-NGRAPH_OP(Subtract, ngraph::op::v1)
-NGRAPH_OP(Tan, ngraph::op::v0)
-NGRAPH_OP(Tanh, ngraph::op::v0)
-NGRAPH_OP(TensorIterator, ngraph::op::v0)
-NGRAPH_OP(Tile, ngraph::op::v0)
-NGRAPH_OP(Transpose, ngraph::op::v1)
-NGRAPH_OP(Unsqueeze, ngraph::op::v0)
-NGRAPH_OP(VariadicSplit, ngraph::op::v1)
-
-// New operations added in opset2
-NGRAPH_OP(BatchToSpace, ngraph::op::v1)
-NGRAPH_OP(SpaceToBatch, ngraph::op::v1)
-
-// New operations added in opset3
-NGRAPH_OP(EmbeddingBagPackedSum, ngraph::op::v3)
-NGRAPH_OP(EmbeddingSegmentsSum, ngraph::op::v3)
-NGRAPH_OP(EmbeddingBagOffsetsSum, ngraph::op::v3)
-NGRAPH_OP(GRUCell, ngraph::op::v3)
-NGRAPH_OP(NonZero, ngraph::op::v3)
-NGRAPH_OP(RNNCell, ngraph::op::v0)
-NGRAPH_OP(ROIAlign, ngraph::op::v3)
-NGRAPH_OP(ScatterElementsUpdate, ngraph::op::v3)
-NGRAPH_OP(ScatterUpdate, ngraph::op::v3)
-NGRAPH_OP(ShuffleChannels, ngraph::op::v0)
-NGRAPH_OP(ShapeOf, ngraph::op::v3)
-NGRAPH_OP(TopK, ngraph::op::v3)
-
-// New operations added in opset4
-NGRAPH_OP(Acosh, ngraph::op::v3)
-NGRAPH_OP(Asinh, ngraph::op::v3)
-NGRAPH_OP(Atanh, ngraph::op::v3)
-NGRAPH_OP(CTCLoss, ngraph::op::v4)
-NGRAPH_OP(HSwish, ngraph::op::v4)
-NGRAPH_OP(Interpolate, ngraph::op::v4)
-NGRAPH_OP(Mish, ngraph::op::v4)
-NGRAPH_OP(ReduceL1, ngraph::op::v4)
-NGRAPH_OP(ReduceL2, ngraph::op::v4)
-NGRAPH_OP(SoftPlus, ngraph::op::v4)
-NGRAPH_OP(Swish, ngraph::op::v4)
-
-// New operations added in opset5
-NGRAPH_OP(GatherND, ngraph::op::v5)
-NGRAPH_OP(GRUSequence, ngraph::op::v5)
-NGRAPH_OP(HSigmoid, ngraph::op::v5)
-NGRAPH_OP(LogSoftmax, ngraph::op::v5)
-NGRAPH_OP(Loop, ngraph::op::v5)
-NGRAPH_OP(LSTMSequence, ngraph::op::v5)
-NGRAPH_OP(NonMaxSuppression, ngraph::op::v5)
-NGRAPH_OP(RNNSequence, ngraph::op::v5)
-NGRAPH_OP(Round, ngraph::op::v5)
-
-// New operations added in opset6
-NGRAPH_OP(CTCGreedyDecoderSeqLen, ngraph::op::v6)
-NGRAPH_OP(ExperimentalDetectronDetectionOutput, ngraph::op::v6)
-NGRAPH_OP(ExperimentalDetectronGenerateProposalsSingleImage, ngraph::op::v6)
-NGRAPH_OP(ExperimentalDetectronPriorGridGenerator, ngraph::op::v6)
-NGRAPH_OP(ExperimentalDetectronROIFeatureExtractor, ngraph::op::v6)
-NGRAPH_OP(ExperimentalDetectronTopKROIs, ngraph::op::v6)
-NGRAPH_OP(GatherElements, ngraph::op::v6)
-NGRAPH_OP(MVN, ngraph::op::v6)
-NGRAPH_OP(Assign, ngraph::op::v6)     // new version
-NGRAPH_OP(ReadValue, ngraph::op::v6)  // new version
-
-// New operations added in opset7
-NGRAPH_OP(DFT, ngraph::op::v7)
-NGRAPH_OP(Einsum, ngraph::op::v7)
-NGRAPH_OP(Gelu, ngraph::op::v7)
-NGRAPH_OP(IDFT, ngraph::op::v7)
-NGRAPH_OP(Roll, ngraph::op::v7)
+#define OPENVINO_OP NGRAPH_OP
+#include "openvino/opsets/opset7_tbl.hpp"
+#undef OPENVINO_OP
diff --git a/ngraph/core/include/ngraph/opsets/opset8_tbl.hpp b/ngraph/core/include/ngraph/opsets/opset8_tbl.hpp
index faf3d65593a..a57cb4318da 100644
--- a/ngraph/core/include/ngraph/opsets/opset8_tbl.hpp
+++ b/ngraph/core/include/ngraph/opsets/opset8_tbl.hpp
@@ -7,179 +7,6 @@
 #    define NGRAPH_OP(x, y)
 #endif
 
-NGRAPH_OP(Abs, ngraph::op::v0)
-NGRAPH_OP(Acos, ngraph::op::v0)
-NGRAPH_OP(Add, ngraph::op::v1)
-NGRAPH_OP(Asin, ngraph::op::v0)
-NGRAPH_OP(Atan, ngraph::op::v0)
-NGRAPH_OP(AvgPool, ngraph::op::v1)
-NGRAPH_OP(BatchNormInference, ngraph::op::v5)
-NGRAPH_OP(BinaryConvolution, ngraph::op::v1)
-NGRAPH_OP(Broadcast, ngraph::op::v3)
-NGRAPH_OP(Bucketize, ngraph::op::v3)
-NGRAPH_OP(CTCGreedyDecoder, ngraph::op::v0)
-NGRAPH_OP(Ceiling, ngraph::op::v0)
-NGRAPH_OP(Clamp, ngraph::op::v0)
-NGRAPH_OP(Concat, ngraph::op::v0)
-NGRAPH_OP(Constant, ngraph::op)
-NGRAPH_OP(Convert, ngraph::op::v0)
-NGRAPH_OP(ConvertLike, ngraph::op::v1)
-NGRAPH_OP(Convolution, ngraph::op::v1)
-NGRAPH_OP(ConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(Cos, ngraph::op::v0)
-NGRAPH_OP(Cosh, ngraph::op::v0)
-NGRAPH_OP(CumSum, ngraph::op::v0)
-NGRAPH_OP(DeformablePSROIPooling, ngraph::op::v1)
-NGRAPH_OP(DepthToSpace, ngraph::op::v0)
-NGRAPH_OP(DetectionOutput, ngraph::op::v0)
-NGRAPH_OP(Divide, ngraph::op::v1)
-NGRAPH_OP(Elu, ngraph::op::v0)
-NGRAPH_OP(Erf, ngraph::op::v0)
-NGRAPH_OP(Equal, ngraph::op::v1)
-NGRAPH_OP(Exp, ngraph::op::v0)
-NGRAPH_OP(ExtractImagePatches, ngraph::op::v3)
-NGRAPH_OP(FakeQuantize, ngraph::op::v0)
-NGRAPH_OP(Floor, ngraph::op::v0)
-NGRAPH_OP(FloorMod, ngraph::op::v1)
-NGRAPH_OP(GatherTree, ngraph::op::v1)
-NGRAPH_OP(Greater, ngraph::op::v1)
-NGRAPH_OP(GreaterEqual, ngraph::op::v1)
-NGRAPH_OP(GroupConvolution, ngraph::op::v1)
-NGRAPH_OP(GroupConvolutionBackpropData, ngraph::op::v1)
-NGRAPH_OP(GRN, ngraph::op::v0)
-NGRAPH_OP(HardSigmoid, ngraph::op::v0)
-NGRAPH_OP(Less, ngraph::op::v1)
-NGRAPH_OP(LessEqual, ngraph::op::v1)
-NGRAPH_OP(Log, ngraph::op::v0)
-NGRAPH_OP(LogicalAnd, ngraph::op::v1)
-NGRAPH_OP(LogicalNot, ngraph::op::v1)
-NGRAPH_OP(LogicalOr, ngraph::op::v1)
-NGRAPH_OP(LogicalXor, ngraph::op::v1)
-NGRAPH_OP(LRN, ngraph::op::v0)
-NGRAPH_OP(LSTMCell, ngraph::op::v4)
-NGRAPH_OP(MatMul, ngraph::op::v0)
-NGRAPH_OP(Maximum, ngraph::op::v1)
-NGRAPH_OP(Minimum, ngraph::op::v1)
-NGRAPH_OP(Mod, ngraph::op::v1)
-NGRAPH_OP(Multiply, ngraph::op::v1)
-NGRAPH_OP(Negative, ngraph::op::v0)
-NGRAPH_OP(NormalizeL2, ngraph::op::v0)
-NGRAPH_OP(NotEqual, ngraph::op::v1)
-NGRAPH_OP(OneHot, ngraph::op::v1)
-NGRAPH_OP(PRelu, ngraph::op::v0)
-NGRAPH_OP(PSROIPooling, ngraph::op::v0)
-NGRAPH_OP(Pad, ngraph::op::v1)
-NGRAPH_OP(Parameter, ngraph::op::v0)
-NGRAPH_OP(Power, ngraph::op::v1)
-NGRAPH_OP(PriorBox, ngraph::op::v0)
-NGRAPH_OP(PriorBoxClustered, ngraph::op::v0)
-NGRAPH_OP(Proposal, ngraph::op::v4)
-NGRAPH_OP(Range, ngraph::op::v4)
-NGRAPH_OP(Relu, ngraph::op::v0)
-NGRAPH_OP(ReduceMax, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalAnd, ngraph::op::v1)
-NGRAPH_OP(ReduceLogicalOr, ngraph::op::v1)
-NGRAPH_OP(ReduceMean, ngraph::op::v1)
-NGRAPH_OP(ReduceMin, ngraph::op::v1)
-NGRAPH_OP(ReduceProd, ngraph::op::v1)
-NGRAPH_OP(ReduceSum, ngraph::op::v1)
-NGRAPH_OP(RegionYolo, ngraph::op::v0)
-NGRAPH_OP(ReorgYolo, ngraph::op::v0)
-NGRAPH_OP(Reshape, ngraph::op::v1)
-NGRAPH_OP(Result, ngraph::op::v0)
-NGRAPH_OP(ReverseSequence, ngraph::op::v0)
-NGRAPH_OP(ROIPooling, ngraph::op::v0)
-NGRAPH_OP(ScatterNDUpdate, ngraph::op::v3)
-NGRAPH_OP(Select, ngraph::op::v1)
-NGRAPH_OP(Selu, ngraph::op::v0)
-NGRAPH_OP(Sign, ngraph::op::v0)
-NGRAPH_OP(Sigmoid, ngraph::op::v0)
-NGRAPH_OP(Sin, ngraph::op::v0)
-NGRAPH_OP(Sinh, ngraph::op::v0)
-NGRAPH_OP(Softmax, ngraph::op::v1)
-NGRAPH_OP(Sqrt, ngraph::op::v0)
-NGRAPH_OP(SpaceToDepth, ngraph::op::v0)
-NGRAPH_OP(Split, ngraph::op::v1)
-NGRAPH_OP(SquaredDifference, ngraph::op::v0)
-NGRAPH_OP(Squeeze, ngraph::op::v0)
-NGRAPH_OP(StridedSlice, ngraph::op::v1)
-NGRAPH_OP(Subtract, ngraph::op::v1)
-NGRAPH_OP(Tan, ngraph::op::v0)
-NGRAPH_OP(Tanh, ngraph::op::v0)
-NGRAPH_OP(TensorIterator, ngraph::op::v0)
-NGRAPH_OP(Tile, ngraph::op::v0)
-NGRAPH_OP(Transpose, ngraph::op::v1)
-NGRAPH_OP(Unsqueeze, ngraph::op::v0)
-NGRAPH_OP(VariadicSplit, ngraph::op::v1)
-
-// New operations added in opset2
-NGRAPH_OP(BatchToSpace, ngraph::op::v1)
-NGRAPH_OP(SpaceToBatch, ngraph::op::v1)
-
-// New operations added in opset3
-NGRAPH_OP(EmbeddingBagPackedSum, ngraph::op::v3)
-NGRAPH_OP(EmbeddingSegmentsSum, ngraph::op::v3)
-NGRAPH_OP(EmbeddingBagOffsetsSum, ngraph::op::v3)
-NGRAPH_OP(GRUCell, ngraph::op::v3)
-NGRAPH_OP(NonZero, ngraph::op::v3)
-NGRAPH_OP(RNNCell, ngraph::op::v0)
-NGRAPH_OP(ROIAlign, ngraph::op::v3)
-NGRAPH_OP(ScatterElementsUpdate, ngraph::op::v3)
-NGRAPH_OP(ScatterUpdate, ngraph::op::v3)
-NGRAPH_OP(ShuffleChannels, ngraph::op::v0)
-NGRAPH_OP(ShapeOf, ngraph::op::v3)
-NGRAPH_OP(TopK, ngraph::op::v3)
-
-// New operations added in opset4
-NGRAPH_OP(Acosh, ngraph::op::v3)
-NGRAPH_OP(Asinh, ngraph::op::v3)
-NGRAPH_OP(Atanh, ngraph::op::v3)
-NGRAPH_OP(CTCLoss, ngraph::op::v4)
-NGRAPH_OP(HSwish, ngraph::op::v4)
-NGRAPH_OP(Interpolate, ngraph::op::v4)
-NGRAPH_OP(Mish, ngraph::op::v4)
-NGRAPH_OP(ReduceL1, ngraph::op::v4)
-NGRAPH_OP(ReduceL2, ngraph::op::v4)
-NGRAPH_OP(SoftPlus, ngraph::op::v4)
-NGRAPH_OP(Swish, ngraph::op::v4)
-
-// New operations added in opset5
-NGRAPH_OP(GatherND, ngraph::op::v5)
-NGRAPH_OP(GRUSequence, ngraph::op::v5)
-NGRAPH_OP(HSigmoid, ngraph::op::v5)
-NGRAPH_OP(LogSoftmax, ngraph::op::v5)
-NGRAPH_OP(Loop, ngraph::op::v5)
-NGRAPH_OP(LSTMSequence, ngraph::op::v5)
-NGRAPH_OP(NonMaxSuppression, ngraph::op::v5)
-NGRAPH_OP(RNNSequence, ngraph::op::v5)
-NGRAPH_OP(Round, ngraph::op::v5)
-
-// New operations added in opset6
-NGRAPH_OP(CTCGreedyDecoderSeqLen, ngraph::op::v6)
-NGRAPH_OP(ExperimentalDetectronDetectionOutput, ngraph::op::v6)
-NGRAPH_OP(ExperimentalDetectronGenerateProposalsSingleImage, ngraph::op::v6)
-NGRAPH_OP(ExperimentalDetectronPriorGridGenerator, ngraph::op::v6)
-NGRAPH_OP(ExperimentalDetectronROIFeatureExtractor, ngraph::op::v6)
-NGRAPH_OP(ExperimentalDetectronTopKROIs, ngraph::op::v6)
-NGRAPH_OP(GatherElements, ngraph::op::v6)
-NGRAPH_OP(MVN, ngraph::op::v6)
-NGRAPH_OP(Assign, ngraph::op::v6)     // new version
-NGRAPH_OP(ReadValue, ngraph::op::v6)  // new version
-
-// New operations added in opset7
-NGRAPH_OP(DFT, ngraph::op::v7)
-NGRAPH_OP(Einsum, ngraph::op::v7)
-NGRAPH_OP(Gelu, ngraph::op::v7)
-NGRAPH_OP(IDFT, ngraph::op::v7)
-NGRAPH_OP(Roll, ngraph::op::v7)
-
-// New operations added in opset8
-NGRAPH_OP(Gather, ngraph::op::v8)
-NGRAPH_OP(AdaptiveAvgPool, ngraph::op::v8)
-NGRAPH_OP(AdaptiveMaxPool, ngraph::op::v8)
-NGRAPH_OP(DeformableConvolution, ngraph::op::v8)
-NGRAPH_OP(MatrixNms, ngraph::op::v8)
-NGRAPH_OP(MaxPool, ngraph::op::v8)
-NGRAPH_OP(MulticlassNms, ngraph::op::v8)
-NGRAPH_OP(RandomUniform, ngraph::op::v8)
-NGRAPH_OP(If, ngraph::op::v8)
+#define OPENVINO_OP NGRAPH_OP
+#include "openvino/opsets/opset8_tbl.hpp"
+#undef OPENVINO_OP
diff --git a/ngraph/core/include/openvino/op/ops.hpp b/ngraph/core/include/openvino/op/ops.hpp
new file mode 100644
index 00000000000..773986c918a
--- /dev/null
+++ b/ngraph/core/include/openvino/op/ops.hpp
@@ -0,0 +1,171 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+// All OpenVINO Operation Headers
+
+#pragma once
+
+#include "openvino/op/abs.hpp"
+#include "openvino/op/acos.hpp"
+#include "openvino/op/acosh.hpp"
+#include "openvino/op/adaptive_avg_pool.hpp"
+#include "openvino/op/adaptive_max_pool.hpp"
+#include "openvino/op/add.hpp"
+#include "openvino/op/asin.hpp"
+#include "openvino/op/asinh.hpp"
+#include "openvino/op/assign.hpp"
+#include "openvino/op/atan.hpp"
+#include "openvino/op/atanh.hpp"
+#include "openvino/op/avg_pool.hpp"
+#include "openvino/op/batch_norm.hpp"
+#include "openvino/op/batch_to_space.hpp"
+#include "openvino/op/binary_convolution.hpp"
+#include "openvino/op/broadcast.hpp"
+#include "openvino/op/bucketize.hpp"
+#include "openvino/op/ceiling.hpp"
+#include "openvino/op/clamp.hpp"
+#include "openvino/op/concat.hpp"
+#include "openvino/op/constant.hpp"
+#include "openvino/op/convert.hpp"
+#include "openvino/op/convert_like.hpp"
+#include "openvino/op/convolution.hpp"
+#include "openvino/op/cos.hpp"
+#include "openvino/op/cosh.hpp"
+#include "openvino/op/ctc_greedy_decoder.hpp"
+#include "openvino/op/ctc_greedy_decoder_seq_len.hpp"
+#include "openvino/op/ctc_loss.hpp"
+#include "openvino/op/cum_sum.hpp"
+#include "openvino/op/deformable_convolution.hpp"
+#include "openvino/op/deformable_psroi_pooling.hpp"
+#include "openvino/op/depth_to_space.hpp"
+#include "openvino/op/detection_output.hpp"
+#include "openvino/op/dft.hpp"
+#include "openvino/op/divide.hpp"
+#include "openvino/op/einsum.hpp"
+#include "openvino/op/elu.hpp"
+#include "openvino/op/embedding_segments_sum.hpp"
+#include "openvino/op/embeddingbag_offsets_sum.hpp"
+#include "openvino/op/embeddingbag_packedsum.hpp"
+#include "openvino/op/equal.hpp"
+#include "openvino/op/erf.hpp"
+#include "openvino/op/exp.hpp"
+#include "openvino/op/experimental_detectron_detection_output.hpp"
+#include "openvino/op/experimental_detectron_generate_proposals.hpp"
+#include "openvino/op/experimental_detectron_prior_grid_generator.hpp"
+#include "openvino/op/experimental_detectron_roi_feature.hpp"
+#include "openvino/op/experimental_detectron_topkrois.hpp"
+#include "openvino/op/extractimagepatches.hpp"
+#include "openvino/op/fake_quantize.hpp"
+#include "openvino/op/floor.hpp"
+#include "openvino/op/floor_mod.hpp"
+#include "openvino/op/gather.hpp"
+#include "openvino/op/gather_elements.hpp"
+#include "openvino/op/gather_nd.hpp"
+#include "openvino/op/gather_tree.hpp"
+#include "openvino/op/gelu.hpp"
+#include "openvino/op/greater.hpp"
+#include "openvino/op/greater_eq.hpp"
+#include "openvino/op/grn.hpp"
+#include "openvino/op/group_conv.hpp"
+#include "openvino/op/gru_cell.hpp"
+#include "openvino/op/gru_sequence.hpp"
+#include "openvino/op/hard_sigmoid.hpp"
+#include "openvino/op/hsigmoid.hpp"
+#include "openvino/op/hswish.hpp"
+#include "openvino/op/idft.hpp"
+#include "openvino/op/if.hpp"
+#include "openvino/op/interpolate.hpp"
+#include "openvino/op/less.hpp"
+#include "openvino/op/less_eq.hpp"
+#include "openvino/op/log.hpp"
+#include "openvino/op/log_softmax.hpp"
+#include "openvino/op/logical_and.hpp"
+#include "openvino/op/logical_not.hpp"
+#include "openvino/op/logical_or.hpp"
+#include "openvino/op/loop.hpp"
+#include "openvino/op/lrn.hpp"
+#include "openvino/op/lstm_cell.hpp"
+#include "openvino/op/lstm_sequence.hpp"
+#include "openvino/op/matmul.hpp"
+#include "openvino/op/matrix_nms.hpp"
+#include "openvino/op/max.hpp"
+#include "openvino/op/max_pool.hpp"
+#include "openvino/op/maximum.hpp"
+#include "openvino/op/minimum.hpp"
+#include "openvino/op/mish.hpp"
+#include "openvino/op/mod.hpp"
+#include "openvino/op/multiclass_nms.hpp"
+#include "openvino/op/multiply.hpp"
+#include "openvino/op/mvn.hpp"
+#include "openvino/op/negative.hpp"
+#include "openvino/op/non_max_suppression.hpp"
+#include "openvino/op/non_zero.hpp"
+#include "openvino/op/normalize_l2.hpp"
+#include "openvino/op/not_equal.hpp"
+#include "openvino/op/one_hot.hpp"
+#include "openvino/op/pad.hpp"
+#include "openvino/op/parameter.hpp"
+#include "openvino/op/power.hpp"
+#include "openvino/op/prelu.hpp"
+#include "openvino/op/prior_box.hpp"
+#include "openvino/op/prior_box_clustered.hpp"
+#include "openvino/op/proposal.hpp"
+#include "openvino/op/psroi_pooling.hpp"
+#include "openvino/op/random_uniform.hpp"
+#include "openvino/op/range.hpp"
+#include "openvino/op/read_value.hpp"
+#include "openvino/op/reduce_l1.hpp"
+#include "openvino/op/reduce_l2.hpp"
+#include "openvino/op/reduce_logical_and.hpp"
+#include "openvino/op/reduce_logical_or.hpp"
+#include "openvino/op/reduce_mean.hpp"
+#include "openvino/op/reduce_min.hpp"
+#include "openvino/op/reduce_prod.hpp"
+#include "openvino/op/reduce_sum.hpp"
+#include "openvino/op/region_yolo.hpp"
+#include "openvino/op/relu.hpp"
+#include "openvino/op/reorg_yolo.hpp"
+#include "openvino/op/reshape.hpp"
+#include "openvino/op/result.hpp"
+#include "openvino/op/reverse.hpp"
+#include "openvino/op/reverse_sequence.hpp"
+#include "openvino/op/rnn_cell.hpp"
+#include "openvino/op/rnn_sequence.hpp"
+#include "openvino/op/roi_align.hpp"
+#include "openvino/op/roi_pooling.hpp"
+#include "openvino/op/roll.hpp"
+#include "openvino/op/round.hpp"
+#include "openvino/op/scatter_elements_update.hpp"
+#include "openvino/op/scatter_nd_update.hpp"
+#include "openvino/op/scatter_update.hpp"
+#include "openvino/op/select.hpp"
+#include "openvino/op/selu.hpp"
+#include "openvino/op/shape_of.hpp"
+#include "openvino/op/shuffle_channels.hpp"
+#include "openvino/op/sigmoid.hpp"
+#include "openvino/op/sign.hpp"
+#include "openvino/op/sin.hpp"
+#include "openvino/op/sinh.hpp"
+#include "openvino/op/softmax.hpp"
+#include "openvino/op/softplus.hpp"
+#include "openvino/op/space_to_batch.hpp"
+#include "openvino/op/space_to_depth.hpp"
+#include "openvino/op/split.hpp"
+#include "openvino/op/sqrt.hpp"
+#include "openvino/op/squared_difference.hpp"
+#include "openvino/op/squeeze.hpp"
+#include "openvino/op/strided_slice.hpp"
+#include "openvino/op/subtract.hpp"
+#include "openvino/op/swish.hpp"
+#include "openvino/op/tan.hpp"
+#include "openvino/op/tanh.hpp"
+#include "openvino/op/tensor_iterator.hpp"
+#include "openvino/op/tile.hpp"
+#include "openvino/op/topk.hpp"
+#include "openvino/op/transpose.hpp"
+#include "openvino/op/unsqueeze.hpp"
+#include "openvino/op/util/attr_types.hpp"
+#include "openvino/op/util/op_types.hpp"
+#include "openvino/op/variadic_split.hpp"
+#include "openvino/op/xor.hpp"
diff --git a/ngraph/core/include/openvino/opsets/opset.hpp b/ngraph/core/include/openvino/opsets/opset.hpp
new file mode 100644
index 00000000000..8503d815313
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset.hpp
@@ -0,0 +1,119 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include <locale>
+#include <map>
+#include <mutex>
+#include <set>
+#include <utility>
+
+#include "ngraph/factory.hpp"
+#include "openvino/core/node.hpp"
+
+namespace ov {
+/// \brief Run-time opset information
+class OPENVINO_API OpSet {
+    static std::mutex& get_mutex();
+
+public:
+    OpSet() = default;
+    virtual ~OpSet() = default;
+    std::set<NodeTypeInfo>::size_type size() const {
+        std::lock_guard<std::mutex> guard(get_mutex());
+        return m_op_types.size();
+    }
+
+    /// \brief Insert OP_TYPE into the opset with a special name and the default factory
+    template <typename OP_TYPE>
+    void insert(const std::string& name) {
+        insert(name, OP_TYPE::type_info, ngraph::FactoryRegistry<Node>::get_default_factory<OP_TYPE>());
+    }
+
+    /// \brief Insert OP_TYPE into the opset with the default name and factory
+    template <typename OP_TYPE>
+    void insert() {
+        insert<OP_TYPE>(OP_TYPE::type_info.name);
+    }
+
+    const std::set<NodeTypeInfo>& get_types_info() const {
+        return m_op_types;
+    }
+    /// \brief Create the op named name using it's factory
+    ov::Node* create(const std::string& name) const;
+
+    /// \brief Create the op named name using it's factory
+    ov::Node* create_insensitive(const std::string& name) const;
+
+    /// \brief Return true if OP_TYPE is in the opset
+    bool contains_type(const NodeTypeInfo& type_info) const {
+        std::lock_guard<std::mutex> guard(get_mutex());
+        return m_op_types.find(type_info) != m_op_types.end();
+    }
+
+    /// \brief Return true if OP_TYPE is in the opset
+    template <typename OP_TYPE>
+    bool contains_type() const {
+        return contains_type(OP_TYPE::type_info);
+    }
+
+    /// \brief Return true if name is in the opset
+    bool contains_type(const std::string& name) const {
+        std::lock_guard<std::mutex> guard(get_mutex());
+        return m_name_type_info_map.find(name) != m_name_type_info_map.end();
+    }
+
+    /// \brief Return true if name is in the opset
+    bool contains_type_insensitive(const std::string& name) const {
+        std::lock_guard<std::mutex> guard(get_mutex());
+        return m_case_insensitive_type_info_map.find(to_upper_name(name)) != m_case_insensitive_type_info_map.end();
+    }
+
+    /// \brief Return true if node's type is in the opset
+    bool contains_op_type(const Node* node) const {
+        std::lock_guard<std::mutex> guard(get_mutex());
+        return m_op_types.find(node->get_type_info()) != m_op_types.end();
+    }
+
+    const std::set<NodeTypeInfo>& get_type_info_set() const {
+        return m_op_types;
+    }
+
+protected:
+    static std::string to_upper_name(const std::string& name) {
+        std::string upper_name = name;
+        std::locale loc;
+        std::transform(upper_name.begin(), upper_name.end(), upper_name.begin(), [&loc](char c) {
+            return std::toupper(c, loc);
+        });
+        return upper_name;
+    }
+
+    ngraph::FactoryRegistry<ov::Node> m_factory_registry;
+    std::set<NodeTypeInfo> m_op_types;
+    std::map<std::string, NodeTypeInfo> m_name_type_info_map;
+    std::map<std::string, NodeTypeInfo> m_case_insensitive_type_info_map;
+
+    /// \brief Insert an op into the opset with a particular name and factory
+    void insert(const std::string& name,
+                const NodeTypeInfo& type_info,
+                ngraph::FactoryRegistry<Node>::Factory factory) {
+        std::lock_guard<std::mutex> guard(get_mutex());
+        m_op_types.insert(type_info);
+        m_name_type_info_map[name] = type_info;
+        m_case_insensitive_type_info_map[to_upper_name(name)] = type_info;
+        m_factory_registry.register_factory(type_info, std::move(factory));
+    }
+};
+
+const OPENVINO_API OpSet& get_opset1();
+const OPENVINO_API OpSet& get_opset2();
+const OPENVINO_API OpSet& get_opset3();
+const OPENVINO_API OpSet& get_opset4();
+const OPENVINO_API OpSet& get_opset5();
+const OPENVINO_API OpSet& get_opset6();
+const OPENVINO_API OpSet& get_opset7();
+const OPENVINO_API OpSet& get_opset8();
+}  // namespace ov
diff --git a/ngraph/core/include/openvino/opsets/opset1.hpp b/ngraph/core/include/openvino/opsets/opset1.hpp
new file mode 100644
index 00000000000..47eb6effa88
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset1.hpp
@@ -0,0 +1,15 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include "openvino/op/ops.hpp"
+
+namespace ov {
+namespace opset1 {
+#define OPENVINO_OP(a, b) using b::a;
+#include "openvino/opsets/opset1_tbl.hpp"
+#undef OPENVINO_OP
+}  // namespace opset1
+}  // namespace ov
diff --git a/ngraph/core/include/openvino/opsets/opset1_tbl.hpp b/ngraph/core/include/openvino/opsets/opset1_tbl.hpp
new file mode 100644
index 00000000000..4bc2bfd7f60
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset1_tbl.hpp
@@ -0,0 +1,150 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+// This collection contains one entry for each op. If an op is added it must be
+// added to this list.
+//
+// In order to use this list you want to define a macro named exactly OPENVINO_OP
+// When you are done you should undef the macro
+// As an example if you wanted to make a list of all op names as strings you could do this:
+//
+// #define OPENVINO_OP(a,b) #a,
+// std::vector<std::string> op_names{
+// #include "this include file name"
+// };
+// #undef OPENVINO_OP
+//
+// This sample expands to a list like this:
+// "Abs",
+// "Acos",
+// ...
+//
+// #define OPENVINO_OP(a,b) b::a,
+// std::vector<std::string> op_names{
+// #include "this include file name"
+// };
+// #undef OPENVINO_OP
+//
+// This sample expands to a list like this:
+// ngraph::op::Abs,
+// ngraph::op::Acos,
+// ...
+//
+// It's that easy. You can use this for fun and profit.
+
+#ifndef OPENVINO_OP
+#    warning "OPENVINO_OP not defined"
+#    define OPENVINO_OP(x, y)
+#endif
+
+OPENVINO_OP(Abs, ngraph::op::v0)
+OPENVINO_OP(Acos, ngraph::op::v0)
+OPENVINO_OP(Add, ngraph::op::v1)
+OPENVINO_OP(Asin, ngraph::op::v0)
+OPENVINO_OP(Atan, ngraph::op::v0)
+OPENVINO_OP(AvgPool, ngraph::op::v1)
+OPENVINO_OP(BatchNormInference, ngraph::op::v0)
+OPENVINO_OP(BinaryConvolution, ngraph::op::v1)
+OPENVINO_OP(Broadcast, ngraph::op::v1)
+OPENVINO_OP(CTCGreedyDecoder, ngraph::op::v0)
+OPENVINO_OP(Ceiling, ngraph::op::v0)
+OPENVINO_OP(Clamp, ngraph::op::v0)
+OPENVINO_OP(Concat, ngraph::op::v0)
+OPENVINO_OP(Constant, ngraph::op)
+OPENVINO_OP(Convert, ngraph::op::v0)
+OPENVINO_OP(ConvertLike, ngraph::op::v1)
+OPENVINO_OP(Convolution, ngraph::op::v1)
+OPENVINO_OP(ConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(Cos, ngraph::op::v0)
+OPENVINO_OP(Cosh, ngraph::op::v0)
+OPENVINO_OP(DeformableConvolution, ngraph::op::v1)
+OPENVINO_OP(DeformablePSROIPooling, ngraph::op::v1)
+OPENVINO_OP(DepthToSpace, ngraph::op::v0)
+OPENVINO_OP(DetectionOutput, ngraph::op::v0)
+OPENVINO_OP(Divide, ngraph::op::v1)
+OPENVINO_OP(Elu, ngraph::op::v0)
+OPENVINO_OP(Erf, ngraph::op::v0)
+OPENVINO_OP(Equal, ngraph::op::v1)
+OPENVINO_OP(Exp, ngraph::op::v0)
+OPENVINO_OP(FakeQuantize, ngraph::op::v0)
+OPENVINO_OP(Floor, ngraph::op::v0)
+OPENVINO_OP(FloorMod, ngraph::op::v1)
+OPENVINO_OP(Gather, ngraph::op::v1)
+OPENVINO_OP(GatherTree, ngraph::op::v1)
+OPENVINO_OP(Greater, ngraph::op::v1)
+OPENVINO_OP(GreaterEqual, ngraph::op::v1)
+OPENVINO_OP(GroupConvolution, ngraph::op::v1)
+OPENVINO_OP(GroupConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(GRN, ngraph::op::v0)
+OPENVINO_OP(HardSigmoid, ngraph::op::v0)
+OPENVINO_OP(Interpolate, ngraph::op::v0)
+OPENVINO_OP(Less, ngraph::op::v1)
+OPENVINO_OP(LessEqual, ngraph::op::v1)
+OPENVINO_OP(Log, ngraph::op::v0)
+OPENVINO_OP(LogicalAnd, ngraph::op::v1)
+OPENVINO_OP(LogicalNot, ngraph::op::v1)
+OPENVINO_OP(LogicalOr, ngraph::op::v1)
+OPENVINO_OP(LogicalXor, ngraph::op::v1)
+OPENVINO_OP(LRN, ngraph::op::v0)
+OPENVINO_OP(LSTMCell, ngraph::op::v0)
+OPENVINO_OP(LSTMSequence, ngraph::op::v0)
+OPENVINO_OP(MatMul, ngraph::op::v0)
+OPENVINO_OP(MaxPool, ngraph::op::v1)
+OPENVINO_OP(Maximum, ngraph::op::v1)
+OPENVINO_OP(Minimum, ngraph::op::v1)
+OPENVINO_OP(Mod, ngraph::op::v1)
+OPENVINO_OP(Multiply, ngraph::op::v1)
+OPENVINO_OP(Negative, ngraph::op::v0)
+OPENVINO_OP(NonMaxSuppression, ngraph::op::v1)
+OPENVINO_OP(NormalizeL2, ngraph::op::v0)
+OPENVINO_OP(NotEqual, ngraph::op::v1)
+OPENVINO_OP(OneHot, ngraph::op::v1)
+OPENVINO_OP(PRelu, ngraph::op::v0)
+OPENVINO_OP(PSROIPooling, ngraph::op::v0)
+OPENVINO_OP(Pad, ngraph::op::v1)
+OPENVINO_OP(Parameter, ngraph::op::v0)
+OPENVINO_OP(Power, ngraph::op::v1)
+OPENVINO_OP(PriorBox, ngraph::op::v0)
+OPENVINO_OP(PriorBoxClustered, ngraph::op::v0)
+OPENVINO_OP(Proposal, ngraph::op::v0)
+OPENVINO_OP(Range, ngraph::op::v0)
+OPENVINO_OP(Relu, ngraph::op::v0)
+OPENVINO_OP(ReduceMax, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalAnd, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalOr, ngraph::op::v1)
+OPENVINO_OP(ReduceMean, ngraph::op::v1)
+OPENVINO_OP(ReduceMin, ngraph::op::v1)
+OPENVINO_OP(ReduceProd, ngraph::op::v1)
+OPENVINO_OP(ReduceSum, ngraph::op::v1)
+OPENVINO_OP(RegionYolo, ngraph::op::v0)
+OPENVINO_OP(Reshape, ngraph::op::v1)
+OPENVINO_OP(Result, ngraph::op::v0)
+OPENVINO_OP(Reverse, ngraph::op::v1)
+OPENVINO_OP(ReverseSequence, ngraph::op::v0)
+OPENVINO_OP(RNNCell, ngraph::op::v0)
+OPENVINO_OP(Select, ngraph::op::v1)
+OPENVINO_OP(Selu, ngraph::op::v0)
+OPENVINO_OP(ShapeOf, ngraph::op::v0)
+OPENVINO_OP(ShuffleChannels, ngraph::op::v0)
+OPENVINO_OP(Sign, ngraph::op::v0)
+OPENVINO_OP(Sigmoid, ngraph::op::v0)
+OPENVINO_OP(Sin, ngraph::op::v0)
+OPENVINO_OP(Sinh, ngraph::op::v0)
+OPENVINO_OP(Softmax, ngraph::op::v1)
+OPENVINO_OP(Sqrt, ngraph::op::v0)
+OPENVINO_OP(SpaceToDepth, ngraph::op::v0)
+OPENVINO_OP(Split, ngraph::op::v1)
+OPENVINO_OP(SquaredDifference, ngraph::op::v0)
+OPENVINO_OP(Squeeze, ngraph::op::v0)
+OPENVINO_OP(StridedSlice, ngraph::op::v1)
+OPENVINO_OP(Subtract, ngraph::op::v1)
+OPENVINO_OP(Tan, ngraph::op::v0)
+OPENVINO_OP(Tanh, ngraph::op::v0)
+OPENVINO_OP(TensorIterator, ngraph::op::v0)
+OPENVINO_OP(Tile, ngraph::op::v0)
+OPENVINO_OP(TopK, ngraph::op::v1)
+OPENVINO_OP(Transpose, ngraph::op::v1)
+OPENVINO_OP(Unsqueeze, ngraph::op::v0)
+OPENVINO_OP(VariadicSplit, ngraph::op::v1)
+OPENVINO_OP(Xor, ngraph::op::v0)
diff --git a/ngraph/core/include/openvino/opsets/opset2.hpp b/ngraph/core/include/openvino/opsets/opset2.hpp
new file mode 100644
index 00000000000..24c1b1befe2
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset2.hpp
@@ -0,0 +1,15 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include "openvino/op/ops.hpp"
+
+namespace ov {
+namespace opset2 {
+#define OPENVINO_OP(a, b) using b::a;
+#include "openvino/opsets/opset2_tbl.hpp"
+#undef OPENVINO_OP
+}  // namespace opset2
+}  // namespace ov
diff --git a/ngraph/core/include/openvino/opsets/opset2_tbl.hpp b/ngraph/core/include/openvino/opsets/opset2_tbl.hpp
new file mode 100644
index 00000000000..139215d2f56
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset2_tbl.hpp
@@ -0,0 +1,143 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef OPENVINO_OP
+#    warning "OPENVINO_OP not defined"
+#    define OPENVINO_OP(x, y)
+#endif
+
+OPENVINO_OP(Abs, ngraph::op::v0)
+OPENVINO_OP(Acos, ngraph::op::v0)
+OPENVINO_OP(Add, ngraph::op::v1)
+OPENVINO_OP(Asin, ngraph::op::v0)
+OPENVINO_OP(Atan, ngraph::op::v0)
+OPENVINO_OP(AvgPool, ngraph::op::v1)
+OPENVINO_OP(BatchNormInference, ngraph::op::v0)
+OPENVINO_OP(BinaryConvolution, ngraph::op::v1)
+OPENVINO_OP(Broadcast, ngraph::op::v1)
+OPENVINO_OP(CTCGreedyDecoder, ngraph::op::v0)
+OPENVINO_OP(Ceiling, ngraph::op::v0)
+OPENVINO_OP(Clamp, ngraph::op::v0)
+OPENVINO_OP(Concat, ngraph::op::v0)
+OPENVINO_OP(Constant, ngraph::op)
+OPENVINO_OP(Convert, ngraph::op::v0)
+OPENVINO_OP(ConvertLike, ngraph::op::v1)
+OPENVINO_OP(Convolution, ngraph::op::v1)
+OPENVINO_OP(ConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(Cos, ngraph::op::v0)
+OPENVINO_OP(Cosh, ngraph::op::v0)
+OPENVINO_OP(DeformableConvolution, ngraph::op::v1)
+OPENVINO_OP(DeformablePSROIPooling, ngraph::op::v1)
+OPENVINO_OP(DepthToSpace, ngraph::op::v0)
+OPENVINO_OP(DetectionOutput, ngraph::op::v0)
+OPENVINO_OP(Divide, ngraph::op::v1)
+OPENVINO_OP(Elu, ngraph::op::v0)
+OPENVINO_OP(Erf, ngraph::op::v0)
+OPENVINO_OP(Equal, ngraph::op::v1)
+OPENVINO_OP(Exp, ngraph::op::v0)
+OPENVINO_OP(FakeQuantize, ngraph::op::v0)
+OPENVINO_OP(Floor, ngraph::op::v0)
+OPENVINO_OP(FloorMod, ngraph::op::v1)
+OPENVINO_OP(Gather, ngraph::op::v1)
+OPENVINO_OP(GatherTree, ngraph::op::v1)
+OPENVINO_OP(Greater, ngraph::op::v1)
+OPENVINO_OP(GreaterEqual, ngraph::op::v1)
+OPENVINO_OP(GroupConvolution, ngraph::op::v1)
+OPENVINO_OP(GroupConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(GRN, ngraph::op::v0)
+OPENVINO_OP(HardSigmoid, ngraph::op::v0)
+OPENVINO_OP(Interpolate, ngraph::op::v0)
+OPENVINO_OP(Less, ngraph::op::v1)
+OPENVINO_OP(LessEqual, ngraph::op::v1)
+OPENVINO_OP(Log, ngraph::op::v0)
+OPENVINO_OP(LogicalAnd, ngraph::op::v1)
+OPENVINO_OP(LogicalNot, ngraph::op::v1)
+OPENVINO_OP(LogicalOr, ngraph::op::v1)
+OPENVINO_OP(LogicalXor, ngraph::op::v1)
+OPENVINO_OP(LRN, ngraph::op::v0)
+OPENVINO_OP(LSTMCell, ngraph::op::v0)
+OPENVINO_OP(LSTMSequence, ngraph::op::v0)
+OPENVINO_OP(MatMul, ngraph::op::v0)
+OPENVINO_OP(MaxPool, ngraph::op::v1)
+OPENVINO_OP(Maximum, ngraph::op::v1)
+OPENVINO_OP(Minimum, ngraph::op::v1)
+OPENVINO_OP(Mod, ngraph::op::v1)
+OPENVINO_OP(Multiply, ngraph::op::v1)
+
+OPENVINO_OP(MVN, ngraph::op::v0)  // Missing in opset1
+
+OPENVINO_OP(Negative, ngraph::op::v0)
+OPENVINO_OP(NonMaxSuppression, ngraph::op::v1)
+OPENVINO_OP(NormalizeL2, ngraph::op::v0)
+OPENVINO_OP(NotEqual, ngraph::op::v1)
+OPENVINO_OP(OneHot, ngraph::op::v1)
+OPENVINO_OP(PRelu, ngraph::op::v0)
+OPENVINO_OP(PSROIPooling, ngraph::op::v0)
+OPENVINO_OP(Pad, ngraph::op::v1)
+OPENVINO_OP(Parameter, ngraph::op::v0)
+OPENVINO_OP(Power, ngraph::op::v1)
+OPENVINO_OP(PriorBox, ngraph::op::v0)
+OPENVINO_OP(PriorBoxClustered, ngraph::op::v0)
+OPENVINO_OP(Proposal, ngraph::op::v0)
+OPENVINO_OP(Range, ngraph::op::v0)
+OPENVINO_OP(Relu, ngraph::op::v0)
+OPENVINO_OP(ReduceMax, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalAnd, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalOr, ngraph::op::v1)
+OPENVINO_OP(ReduceMean, ngraph::op::v1)
+OPENVINO_OP(ReduceMin, ngraph::op::v1)
+OPENVINO_OP(ReduceProd, ngraph::op::v1)
+OPENVINO_OP(ReduceSum, ngraph::op::v1)
+OPENVINO_OP(RegionYolo, ngraph::op::v0)
+
+OPENVINO_OP(ReorgYolo, ngraph::op::v0)  // Missing in opset1
+
+OPENVINO_OP(Reshape, ngraph::op::v1)
+OPENVINO_OP(Result, ngraph::op::v0)
+
+// Moved out of opset2, it was added to opset1 by mistake
+// OPENVINO_OP(Reverse, ngraph::op::v1)
+
+OPENVINO_OP(ReverseSequence, ngraph::op::v0)
+
+// Moved out of opset2, it was added to opset1 by mistake
+// OPENVINO_OP(RNNCell, ngraph::op::v0)
+
+OPENVINO_OP(ROIPooling, ngraph::op::v0)  // Missing in opset1
+
+OPENVINO_OP(Select, ngraph::op::v1)
+OPENVINO_OP(Selu, ngraph::op::v0)
+OPENVINO_OP(ShapeOf, ngraph::op::v0)
+
+// Moved out of opset2, it was added to opset1 by mistake
+// OPENVINO_OP(ShuffleChannels, ngraph::op::v0)
+
+OPENVINO_OP(Sign, ngraph::op::v0)
+OPENVINO_OP(Sigmoid, ngraph::op::v0)
+OPENVINO_OP(Sin, ngraph::op::v0)
+OPENVINO_OP(Sinh, ngraph::op::v0)
+OPENVINO_OP(Softmax, ngraph::op::v1)
+OPENVINO_OP(Sqrt, ngraph::op::v0)
+OPENVINO_OP(SpaceToDepth, ngraph::op::v0)
+OPENVINO_OP(Split, ngraph::op::v1)
+OPENVINO_OP(SquaredDifference, ngraph::op::v0)
+OPENVINO_OP(Squeeze, ngraph::op::v0)
+OPENVINO_OP(StridedSlice, ngraph::op::v1)
+OPENVINO_OP(Subtract, ngraph::op::v1)
+OPENVINO_OP(Tan, ngraph::op::v0)
+OPENVINO_OP(Tanh, ngraph::op::v0)
+OPENVINO_OP(TensorIterator, ngraph::op::v0)
+OPENVINO_OP(Tile, ngraph::op::v0)
+OPENVINO_OP(TopK, ngraph::op::v1)
+OPENVINO_OP(Transpose, ngraph::op::v1)
+OPENVINO_OP(Unsqueeze, ngraph::op::v0)
+OPENVINO_OP(VariadicSplit, ngraph::op::v1)
+
+// Moved out of opset2, it was added to opset1 by mistake
+// OPENVINO_OP(Xor, ngraph::op::v0)
+
+// New operations added in opset2
+OPENVINO_OP(Gelu, ngraph::op::v0)
+OPENVINO_OP(BatchToSpace, ngraph::op::v1)
+OPENVINO_OP(SpaceToBatch, ngraph::op::v1)
diff --git a/ngraph/core/include/openvino/opsets/opset3.hpp b/ngraph/core/include/openvino/opsets/opset3.hpp
new file mode 100644
index 00000000000..a2f60e8a9f1
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset3.hpp
@@ -0,0 +1,15 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include "openvino/op/ops.hpp"
+
+namespace ov {
+namespace opset3 {
+#define OPENVINO_OP(a, b) using b::a;
+#include "openvino/opsets/opset3_tbl.hpp"
+#undef OPENVINO_OP
+}  // namespace opset3
+}  // namespace ov
diff --git a/ngraph/core/include/openvino/opsets/opset3_tbl.hpp b/ngraph/core/include/openvino/opsets/opset3_tbl.hpp
new file mode 100644
index 00000000000..f1883c85370
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset3_tbl.hpp
@@ -0,0 +1,159 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef OPENVINO_OP
+#    warning "OPENVINO_OP not defined"
+#    define OPENVINO_OP(x, y)
+#endif
+
+OPENVINO_OP(Abs, ngraph::op::v0)
+OPENVINO_OP(Acos, ngraph::op::v0)
+OPENVINO_OP(Add, ngraph::op::v1)
+OPENVINO_OP(Asin, ngraph::op::v0)
+OPENVINO_OP(Atan, ngraph::op::v0)
+OPENVINO_OP(AvgPool, ngraph::op::v1)
+OPENVINO_OP(BatchNormInference, ngraph::op::v0)
+OPENVINO_OP(BinaryConvolution, ngraph::op::v1)
+OPENVINO_OP(Broadcast, ngraph::op::v3)
+OPENVINO_OP(Bucketize, ngraph::op::v3)
+OPENVINO_OP(CTCGreedyDecoder, ngraph::op::v0)
+OPENVINO_OP(Ceiling, ngraph::op::v0)
+OPENVINO_OP(Clamp, ngraph::op::v0)
+OPENVINO_OP(Concat, ngraph::op::v0)
+OPENVINO_OP(Constant, ngraph::op)
+OPENVINO_OP(Convert, ngraph::op::v0)
+OPENVINO_OP(ConvertLike, ngraph::op::v1)
+OPENVINO_OP(Convolution, ngraph::op::v1)
+OPENVINO_OP(ConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(Cos, ngraph::op::v0)
+OPENVINO_OP(Cosh, ngraph::op::v0)
+OPENVINO_OP(CumSum, ngraph::op::v0)
+OPENVINO_OP(DeformableConvolution, ngraph::op::v1)
+OPENVINO_OP(DeformablePSROIPooling, ngraph::op::v1)
+OPENVINO_OP(DepthToSpace, ngraph::op::v0)
+OPENVINO_OP(DetectionOutput, ngraph::op::v0)
+OPENVINO_OP(Divide, ngraph::op::v1)
+OPENVINO_OP(Elu, ngraph::op::v0)
+OPENVINO_OP(Erf, ngraph::op::v0)
+OPENVINO_OP(Equal, ngraph::op::v1)
+OPENVINO_OP(Exp, ngraph::op::v0)
+OPENVINO_OP(ExtractImagePatches, ngraph::op::v3)
+OPENVINO_OP(FakeQuantize, ngraph::op::v0)
+OPENVINO_OP(Floor, ngraph::op::v0)
+OPENVINO_OP(FloorMod, ngraph::op::v1)
+OPENVINO_OP(Gather, ngraph::op::v1)
+OPENVINO_OP(GatherTree, ngraph::op::v1)
+OPENVINO_OP(Greater, ngraph::op::v1)
+OPENVINO_OP(GreaterEqual, ngraph::op::v1)
+OPENVINO_OP(GroupConvolution, ngraph::op::v1)
+OPENVINO_OP(GroupConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(GRN, ngraph::op::v0)
+OPENVINO_OP(HardSigmoid, ngraph::op::v0)
+OPENVINO_OP(Interpolate, ngraph::op::v0)
+OPENVINO_OP(Less, ngraph::op::v1)
+OPENVINO_OP(LessEqual, ngraph::op::v1)
+OPENVINO_OP(Log, ngraph::op::v0)
+OPENVINO_OP(LogicalAnd, ngraph::op::v1)
+OPENVINO_OP(LogicalNot, ngraph::op::v1)
+OPENVINO_OP(LogicalOr, ngraph::op::v1)
+OPENVINO_OP(LogicalXor, ngraph::op::v1)
+OPENVINO_OP(LRN, ngraph::op::v0)
+OPENVINO_OP(LSTMCell, ngraph::op::v0)
+OPENVINO_OP(LSTMSequence, ngraph::op::v0)
+OPENVINO_OP(MatMul, ngraph::op::v0)
+OPENVINO_OP(MaxPool, ngraph::op::v1)
+OPENVINO_OP(Maximum, ngraph::op::v1)
+OPENVINO_OP(Minimum, ngraph::op::v1)
+OPENVINO_OP(Mod, ngraph::op::v1)
+OPENVINO_OP(Multiply, ngraph::op::v1)
+
+OPENVINO_OP(MVN, ngraph::op::v0)  // Missing in opset1
+
+OPENVINO_OP(Negative, ngraph::op::v0)
+OPENVINO_OP(NonMaxSuppression, ngraph::op::v3)
+OPENVINO_OP(NormalizeL2, ngraph::op::v0)
+OPENVINO_OP(NotEqual, ngraph::op::v1)
+OPENVINO_OP(OneHot, ngraph::op::v1)
+OPENVINO_OP(PRelu, ngraph::op::v0)
+OPENVINO_OP(PSROIPooling, ngraph::op::v0)
+OPENVINO_OP(Pad, ngraph::op::v1)
+OPENVINO_OP(Parameter, ngraph::op::v0)
+OPENVINO_OP(Power, ngraph::op::v1)
+OPENVINO_OP(PriorBox, ngraph::op::v0)
+OPENVINO_OP(PriorBoxClustered, ngraph::op::v0)
+OPENVINO_OP(Proposal, ngraph::op::v0)
+OPENVINO_OP(Range, ngraph::op::v0)
+OPENVINO_OP(Relu, ngraph::op::v0)
+OPENVINO_OP(ReduceMax, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalAnd, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalOr, ngraph::op::v1)
+OPENVINO_OP(ReduceMean, ngraph::op::v1)
+OPENVINO_OP(ReduceMin, ngraph::op::v1)
+OPENVINO_OP(ReduceProd, ngraph::op::v1)
+OPENVINO_OP(ReduceSum, ngraph::op::v1)
+OPENVINO_OP(RegionYolo, ngraph::op::v0)
+
+OPENVINO_OP(ReorgYolo, ngraph::op::v0)  // Missing in opset1
+
+OPENVINO_OP(Reshape, ngraph::op::v1)
+OPENVINO_OP(Result, ngraph::op::v0)
+
+// Moved out of opset2, it was added to opset1 by mistake
+// OPENVINO_OP(Reverse, ngraph::op::v1)
+
+OPENVINO_OP(ReverseSequence, ngraph::op::v0)
+
+// Moved out of opset2, it was added to opset1 by mistake
+// OPENVINO_OP(RNNCell, ngraph::op::v0)
+
+OPENVINO_OP(ROIPooling, ngraph::op::v0)  // Missing in opset1
+
+OPENVINO_OP(Select, ngraph::op::v1)
+OPENVINO_OP(Selu, ngraph::op::v0)
+// Superseded
+// OPENVINO_OP(ShapeOf, ngraph::op::v0)
+
+OPENVINO_OP(Sign, ngraph::op::v0)
+OPENVINO_OP(Sigmoid, ngraph::op::v0)
+OPENVINO_OP(Sin, ngraph::op::v0)
+OPENVINO_OP(Sinh, ngraph::op::v0)
+OPENVINO_OP(Softmax, ngraph::op::v1)
+OPENVINO_OP(Sqrt, ngraph::op::v0)
+OPENVINO_OP(SpaceToDepth, ngraph::op::v0)
+OPENVINO_OP(Split, ngraph::op::v1)
+OPENVINO_OP(SquaredDifference, ngraph::op::v0)
+OPENVINO_OP(Squeeze, ngraph::op::v0)
+OPENVINO_OP(StridedSlice, ngraph::op::v1)
+OPENVINO_OP(Subtract, ngraph::op::v1)
+OPENVINO_OP(Tan, ngraph::op::v0)
+OPENVINO_OP(Tanh, ngraph::op::v0)
+OPENVINO_OP(TensorIterator, ngraph::op::v0)
+OPENVINO_OP(Tile, ngraph::op::v0)
+OPENVINO_OP(Transpose, ngraph::op::v1)
+OPENVINO_OP(Unsqueeze, ngraph::op::v0)
+OPENVINO_OP(VariadicSplit, ngraph::op::v1)
+
+// Moved out of opset2, it was added to opset1 by mistake
+// OPENVINO_OP(Xor, ngraph::op::v0)
+
+// New operations added in opset2
+OPENVINO_OP(Gelu, ngraph::op::v0)
+OPENVINO_OP(BatchToSpace, ngraph::op::v1)
+OPENVINO_OP(SpaceToBatch, ngraph::op::v1)
+
+// New operations added in opset3
+OPENVINO_OP(EmbeddingBagPackedSum, ngraph::op::v3)
+OPENVINO_OP(EmbeddingSegmentsSum, ngraph::op::v3)
+OPENVINO_OP(EmbeddingBagOffsetsSum, ngraph::op::v3)
+OPENVINO_OP(GRUCell, ngraph::op::v3)
+OPENVINO_OP(NonZero, ngraph::op::v3)
+OPENVINO_OP(RNNCell, ngraph::op::v0)
+OPENVINO_OP(ROIAlign, ngraph::op::v3)
+OPENVINO_OP(ScatterElementsUpdate, ngraph::op::v3)
+OPENVINO_OP(ScatterUpdate, ngraph::op::v3)
+OPENVINO_OP(ShuffleChannels, ngraph::op::v0)
+OPENVINO_OP(ShapeOf, ngraph::op::v3)
+OPENVINO_OP(Assign, ngraph::op::v3)
+OPENVINO_OP(ReadValue, ngraph::op::v3)
+OPENVINO_OP(TopK, ngraph::op::v3)
diff --git a/ngraph/core/include/openvino/opsets/opset4.hpp b/ngraph/core/include/openvino/opsets/opset4.hpp
new file mode 100644
index 00000000000..369ea427e9e
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset4.hpp
@@ -0,0 +1,15 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include "openvino/op/ops.hpp"
+
+namespace ov {
+namespace opset4 {
+#define OPENVINO_OP(a, b) using b::a;
+#include "openvino/opsets/opset4_tbl.hpp"
+#undef OPENVINO_OP
+}  // namespace opset4
+}  // namespace ov
diff --git a/ngraph/core/include/openvino/opsets/opset4_tbl.hpp b/ngraph/core/include/openvino/opsets/opset4_tbl.hpp
new file mode 100644
index 00000000000..142ea8cb157
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset4_tbl.hpp
@@ -0,0 +1,152 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef OPENVINO_OP
+#    warning "OPENVINO_OP not defined"
+#    define OPENVINO_OP(x, y)
+#endif
+
+OPENVINO_OP(Abs, ngraph::op::v0)
+OPENVINO_OP(Acos, ngraph::op::v0)
+OPENVINO_OP(Add, ngraph::op::v1)
+OPENVINO_OP(Asin, ngraph::op::v0)
+OPENVINO_OP(Atan, ngraph::op::v0)
+OPENVINO_OP(AvgPool, ngraph::op::v1)
+OPENVINO_OP(BatchNormInference, ngraph::op::v0)
+OPENVINO_OP(BinaryConvolution, ngraph::op::v1)
+OPENVINO_OP(Broadcast, ngraph::op::v3)
+OPENVINO_OP(Bucketize, ngraph::op::v3)
+OPENVINO_OP(CTCGreedyDecoder, ngraph::op::v0)
+OPENVINO_OP(Ceiling, ngraph::op::v0)
+OPENVINO_OP(Clamp, ngraph::op::v0)
+OPENVINO_OP(Concat, ngraph::op::v0)
+OPENVINO_OP(Constant, ngraph::op)
+OPENVINO_OP(Convert, ngraph::op::v0)
+OPENVINO_OP(ConvertLike, ngraph::op::v1)
+OPENVINO_OP(Convolution, ngraph::op::v1)
+OPENVINO_OP(ConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(Cos, ngraph::op::v0)
+OPENVINO_OP(Cosh, ngraph::op::v0)
+OPENVINO_OP(CumSum, ngraph::op::v0)
+OPENVINO_OP(DeformableConvolution, ngraph::op::v1)
+OPENVINO_OP(DeformablePSROIPooling, ngraph::op::v1)
+OPENVINO_OP(DepthToSpace, ngraph::op::v0)
+OPENVINO_OP(DetectionOutput, ngraph::op::v0)
+OPENVINO_OP(Divide, ngraph::op::v1)
+OPENVINO_OP(Elu, ngraph::op::v0)
+OPENVINO_OP(Erf, ngraph::op::v0)
+OPENVINO_OP(Equal, ngraph::op::v1)
+OPENVINO_OP(Exp, ngraph::op::v0)
+OPENVINO_OP(ExtractImagePatches, ngraph::op::v3)
+OPENVINO_OP(FakeQuantize, ngraph::op::v0)
+OPENVINO_OP(Floor, ngraph::op::v0)
+OPENVINO_OP(FloorMod, ngraph::op::v1)
+OPENVINO_OP(Gather, ngraph::op::v1)
+OPENVINO_OP(GatherTree, ngraph::op::v1)
+OPENVINO_OP(Greater, ngraph::op::v1)
+OPENVINO_OP(GreaterEqual, ngraph::op::v1)
+OPENVINO_OP(GroupConvolution, ngraph::op::v1)
+OPENVINO_OP(GroupConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(GRN, ngraph::op::v0)
+OPENVINO_OP(HardSigmoid, ngraph::op::v0)
+OPENVINO_OP(Less, ngraph::op::v1)
+OPENVINO_OP(LessEqual, ngraph::op::v1)
+OPENVINO_OP(Log, ngraph::op::v0)
+OPENVINO_OP(LogicalAnd, ngraph::op::v1)
+OPENVINO_OP(LogicalNot, ngraph::op::v1)
+OPENVINO_OP(LogicalOr, ngraph::op::v1)
+OPENVINO_OP(LogicalXor, ngraph::op::v1)
+OPENVINO_OP(LRN, ngraph::op::v0)
+OPENVINO_OP(LSTMCell, ngraph::op::v4)
+OPENVINO_OP(MatMul, ngraph::op::v0)
+OPENVINO_OP(MaxPool, ngraph::op::v1)
+OPENVINO_OP(Maximum, ngraph::op::v1)
+OPENVINO_OP(Minimum, ngraph::op::v1)
+OPENVINO_OP(Mod, ngraph::op::v1)
+OPENVINO_OP(Multiply, ngraph::op::v1)
+OPENVINO_OP(MVN, ngraph::op::v0)
+OPENVINO_OP(Negative, ngraph::op::v0)
+OPENVINO_OP(NormalizeL2, ngraph::op::v0)
+OPENVINO_OP(NotEqual, ngraph::op::v1)
+OPENVINO_OP(OneHot, ngraph::op::v1)
+OPENVINO_OP(PRelu, ngraph::op::v0)
+OPENVINO_OP(PSROIPooling, ngraph::op::v0)
+OPENVINO_OP(Pad, ngraph::op::v1)
+OPENVINO_OP(Parameter, ngraph::op::v0)
+OPENVINO_OP(Power, ngraph::op::v1)
+OPENVINO_OP(PriorBox, ngraph::op::v0)
+OPENVINO_OP(PriorBoxClustered, ngraph::op::v0)
+OPENVINO_OP(Proposal, ngraph::op::v4)
+OPENVINO_OP(Range, ngraph::op::v4)
+OPENVINO_OP(Relu, ngraph::op::v0)
+OPENVINO_OP(ReduceMax, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalAnd, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalOr, ngraph::op::v1)
+OPENVINO_OP(ReduceMean, ngraph::op::v1)
+OPENVINO_OP(ReduceMin, ngraph::op::v1)
+OPENVINO_OP(ReduceProd, ngraph::op::v1)
+OPENVINO_OP(ReduceSum, ngraph::op::v1)
+OPENVINO_OP(RegionYolo, ngraph::op::v0)
+OPENVINO_OP(ReorgYolo, ngraph::op::v0)
+OPENVINO_OP(Reshape, ngraph::op::v1)
+OPENVINO_OP(Result, ngraph::op::v0)
+OPENVINO_OP(ReverseSequence, ngraph::op::v0)
+OPENVINO_OP(ROIPooling, ngraph::op::v0)
+OPENVINO_OP(ScatterNDUpdate, ngraph::op::v3)
+OPENVINO_OP(Select, ngraph::op::v1)
+OPENVINO_OP(Selu, ngraph::op::v0)
+OPENVINO_OP(Sign, ngraph::op::v0)
+OPENVINO_OP(Sigmoid, ngraph::op::v0)
+OPENVINO_OP(Sin, ngraph::op::v0)
+OPENVINO_OP(Sinh, ngraph::op::v0)
+OPENVINO_OP(Softmax, ngraph::op::v1)
+OPENVINO_OP(Sqrt, ngraph::op::v0)
+OPENVINO_OP(SpaceToDepth, ngraph::op::v0)
+OPENVINO_OP(Split, ngraph::op::v1)
+OPENVINO_OP(SquaredDifference, ngraph::op::v0)
+OPENVINO_OP(Squeeze, ngraph::op::v0)
+OPENVINO_OP(StridedSlice, ngraph::op::v1)
+OPENVINO_OP(Subtract, ngraph::op::v1)
+OPENVINO_OP(Tan, ngraph::op::v0)
+OPENVINO_OP(Tanh, ngraph::op::v0)
+OPENVINO_OP(TensorIterator, ngraph::op::v0)
+OPENVINO_OP(Tile, ngraph::op::v0)
+OPENVINO_OP(Transpose, ngraph::op::v1)
+OPENVINO_OP(Unsqueeze, ngraph::op::v0)
+OPENVINO_OP(VariadicSplit, ngraph::op::v1)
+
+// New operations added in opset2
+OPENVINO_OP(Gelu, ngraph::op::v0)
+OPENVINO_OP(BatchToSpace, ngraph::op::v1)
+OPENVINO_OP(SpaceToBatch, ngraph::op::v1)
+
+// New operations added in opset3
+OPENVINO_OP(EmbeddingBagPackedSum, ngraph::op::v3)
+OPENVINO_OP(EmbeddingSegmentsSum, ngraph::op::v3)
+OPENVINO_OP(EmbeddingBagOffsetsSum, ngraph::op::v3)
+OPENVINO_OP(GRUCell, ngraph::op::v3)
+OPENVINO_OP(NonZero, ngraph::op::v3)
+OPENVINO_OP(RNNCell, ngraph::op::v0)
+OPENVINO_OP(ROIAlign, ngraph::op::v3)
+OPENVINO_OP(ScatterElementsUpdate, ngraph::op::v3)
+OPENVINO_OP(ScatterUpdate, ngraph::op::v3)
+OPENVINO_OP(ShuffleChannels, ngraph::op::v0)
+OPENVINO_OP(ShapeOf, ngraph::op::v3)
+OPENVINO_OP(Assign, ngraph::op::v3)
+OPENVINO_OP(ReadValue, ngraph::op::v3)
+OPENVINO_OP(TopK, ngraph::op::v3)
+
+// New operations added in opset4
+OPENVINO_OP(Acosh, ngraph::op::v3)
+OPENVINO_OP(Asinh, ngraph::op::v3)
+OPENVINO_OP(Atanh, ngraph::op::v3)
+OPENVINO_OP(CTCLoss, ngraph::op::v4)
+OPENVINO_OP(HSwish, ngraph::op::v4)
+OPENVINO_OP(Interpolate, ngraph::op::v4)
+OPENVINO_OP(Mish, ngraph::op::v4)
+OPENVINO_OP(NonMaxSuppression, ngraph::op::v4)
+OPENVINO_OP(ReduceL1, ngraph::op::v4)
+OPENVINO_OP(ReduceL2, ngraph::op::v4)
+OPENVINO_OP(SoftPlus, ngraph::op::v4)
+OPENVINO_OP(Swish, ngraph::op::v4)
diff --git a/ngraph/core/include/openvino/opsets/opset5.hpp b/ngraph/core/include/openvino/opsets/opset5.hpp
new file mode 100644
index 00000000000..736fa00f529
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset5.hpp
@@ -0,0 +1,15 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include "openvino/op/ops.hpp"
+
+namespace ov {
+namespace opset5 {
+#define OPENVINO_OP(a, b) using b::a;
+#include "openvino/opsets/opset5_tbl.hpp"
+#undef OPENVINO_OP
+}  // namespace opset5
+}  // namespace ov
diff --git a/ngraph/core/include/openvino/opsets/opset5_tbl.hpp b/ngraph/core/include/openvino/opsets/opset5_tbl.hpp
new file mode 100644
index 00000000000..bde996f3252
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset5_tbl.hpp
@@ -0,0 +1,162 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef OPENVINO_OP
+#    warning "OPENVINO_OP not defined"
+#    define OPENVINO_OP(x, y)
+#endif
+
+OPENVINO_OP(Abs, ngraph::op::v0)
+OPENVINO_OP(Acos, ngraph::op::v0)
+OPENVINO_OP(Add, ngraph::op::v1)
+OPENVINO_OP(Asin, ngraph::op::v0)
+OPENVINO_OP(Atan, ngraph::op::v0)
+OPENVINO_OP(AvgPool, ngraph::op::v1)
+OPENVINO_OP(BatchNormInference, ngraph::op::v5)
+OPENVINO_OP(BinaryConvolution, ngraph::op::v1)
+OPENVINO_OP(Broadcast, ngraph::op::v3)
+OPENVINO_OP(Bucketize, ngraph::op::v3)
+OPENVINO_OP(CTCGreedyDecoder, ngraph::op::v0)
+OPENVINO_OP(Ceiling, ngraph::op::v0)
+OPENVINO_OP(Clamp, ngraph::op::v0)
+OPENVINO_OP(Concat, ngraph::op::v0)
+OPENVINO_OP(Constant, ngraph::op)
+OPENVINO_OP(Convert, ngraph::op::v0)
+OPENVINO_OP(ConvertLike, ngraph::op::v1)
+OPENVINO_OP(Convolution, ngraph::op::v1)
+OPENVINO_OP(ConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(Cos, ngraph::op::v0)
+OPENVINO_OP(Cosh, ngraph::op::v0)
+OPENVINO_OP(CumSum, ngraph::op::v0)
+OPENVINO_OP(DeformableConvolution, ngraph::op::v1)
+OPENVINO_OP(DeformablePSROIPooling, ngraph::op::v1)
+OPENVINO_OP(DepthToSpace, ngraph::op::v0)
+OPENVINO_OP(DetectionOutput, ngraph::op::v0)
+OPENVINO_OP(Divide, ngraph::op::v1)
+OPENVINO_OP(Elu, ngraph::op::v0)
+OPENVINO_OP(Erf, ngraph::op::v0)
+OPENVINO_OP(Equal, ngraph::op::v1)
+OPENVINO_OP(Exp, ngraph::op::v0)
+OPENVINO_OP(ExtractImagePatches, ngraph::op::v3)
+OPENVINO_OP(FakeQuantize, ngraph::op::v0)
+OPENVINO_OP(Floor, ngraph::op::v0)
+OPENVINO_OP(FloorMod, ngraph::op::v1)
+OPENVINO_OP(Gather, ngraph::op::v1)
+OPENVINO_OP(GatherTree, ngraph::op::v1)
+OPENVINO_OP(Greater, ngraph::op::v1)
+OPENVINO_OP(GreaterEqual, ngraph::op::v1)
+OPENVINO_OP(GroupConvolution, ngraph::op::v1)
+OPENVINO_OP(GroupConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(GRN, ngraph::op::v0)
+OPENVINO_OP(HardSigmoid, ngraph::op::v0)
+OPENVINO_OP(Less, ngraph::op::v1)
+OPENVINO_OP(LessEqual, ngraph::op::v1)
+OPENVINO_OP(Log, ngraph::op::v0)
+OPENVINO_OP(LogicalAnd, ngraph::op::v1)
+OPENVINO_OP(LogicalNot, ngraph::op::v1)
+OPENVINO_OP(LogicalOr, ngraph::op::v1)
+OPENVINO_OP(LogicalXor, ngraph::op::v1)
+OPENVINO_OP(LRN, ngraph::op::v0)
+OPENVINO_OP(LSTMCell, ngraph::op::v4)
+OPENVINO_OP(MatMul, ngraph::op::v0)
+OPENVINO_OP(MaxPool, ngraph::op::v1)
+OPENVINO_OP(Maximum, ngraph::op::v1)
+OPENVINO_OP(Minimum, ngraph::op::v1)
+OPENVINO_OP(Mod, ngraph::op::v1)
+OPENVINO_OP(Multiply, ngraph::op::v1)
+OPENVINO_OP(MVN, ngraph::op::v0)
+OPENVINO_OP(Negative, ngraph::op::v0)
+OPENVINO_OP(NormalizeL2, ngraph::op::v0)
+OPENVINO_OP(NotEqual, ngraph::op::v1)
+OPENVINO_OP(OneHot, ngraph::op::v1)
+OPENVINO_OP(PRelu, ngraph::op::v0)
+OPENVINO_OP(PSROIPooling, ngraph::op::v0)
+OPENVINO_OP(Pad, ngraph::op::v1)
+OPENVINO_OP(Parameter, ngraph::op::v0)
+OPENVINO_OP(Power, ngraph::op::v1)
+OPENVINO_OP(PriorBox, ngraph::op::v0)
+OPENVINO_OP(PriorBoxClustered, ngraph::op::v0)
+OPENVINO_OP(Proposal, ngraph::op::v4)
+OPENVINO_OP(Range, ngraph::op::v4)
+OPENVINO_OP(Relu, ngraph::op::v0)
+OPENVINO_OP(ReduceMax, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalAnd, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalOr, ngraph::op::v1)
+OPENVINO_OP(ReduceMean, ngraph::op::v1)
+OPENVINO_OP(ReduceMin, ngraph::op::v1)
+OPENVINO_OP(ReduceProd, ngraph::op::v1)
+OPENVINO_OP(ReduceSum, ngraph::op::v1)
+OPENVINO_OP(RegionYolo, ngraph::op::v0)
+OPENVINO_OP(ReorgYolo, ngraph::op::v0)
+OPENVINO_OP(Reshape, ngraph::op::v1)
+OPENVINO_OP(Result, ngraph::op::v0)
+OPENVINO_OP(ReverseSequence, ngraph::op::v0)
+OPENVINO_OP(ROIPooling, ngraph::op::v0)
+OPENVINO_OP(ScatterNDUpdate, ngraph::op::v3)
+OPENVINO_OP(Select, ngraph::op::v1)
+OPENVINO_OP(Selu, ngraph::op::v0)
+OPENVINO_OP(Sign, ngraph::op::v0)
+OPENVINO_OP(Sigmoid, ngraph::op::v0)
+OPENVINO_OP(Sin, ngraph::op::v0)
+OPENVINO_OP(Sinh, ngraph::op::v0)
+OPENVINO_OP(Softmax, ngraph::op::v1)
+OPENVINO_OP(Sqrt, ngraph::op::v0)
+OPENVINO_OP(SpaceToDepth, ngraph::op::v0)
+OPENVINO_OP(Split, ngraph::op::v1)
+OPENVINO_OP(SquaredDifference, ngraph::op::v0)
+OPENVINO_OP(Squeeze, ngraph::op::v0)
+OPENVINO_OP(StridedSlice, ngraph::op::v1)
+OPENVINO_OP(Subtract, ngraph::op::v1)
+OPENVINO_OP(Tan, ngraph::op::v0)
+OPENVINO_OP(Tanh, ngraph::op::v0)
+OPENVINO_OP(TensorIterator, ngraph::op::v0)
+OPENVINO_OP(Tile, ngraph::op::v0)
+OPENVINO_OP(Transpose, ngraph::op::v1)
+OPENVINO_OP(Unsqueeze, ngraph::op::v0)
+OPENVINO_OP(VariadicSplit, ngraph::op::v1)
+
+// New operations added in opset2
+OPENVINO_OP(Gelu, ngraph::op::v0)
+OPENVINO_OP(BatchToSpace, ngraph::op::v1)
+OPENVINO_OP(SpaceToBatch, ngraph::op::v1)
+
+// New operations added in opset3
+OPENVINO_OP(EmbeddingBagPackedSum, ngraph::op::v3)
+OPENVINO_OP(EmbeddingSegmentsSum, ngraph::op::v3)
+OPENVINO_OP(EmbeddingBagOffsetsSum, ngraph::op::v3)
+OPENVINO_OP(GRUCell, ngraph::op::v3)
+OPENVINO_OP(NonZero, ngraph::op::v3)
+OPENVINO_OP(RNNCell, ngraph::op::v0)
+OPENVINO_OP(ROIAlign, ngraph::op::v3)
+OPENVINO_OP(ScatterElementsUpdate, ngraph::op::v3)
+OPENVINO_OP(ScatterUpdate, ngraph::op::v3)
+OPENVINO_OP(ShuffleChannels, ngraph::op::v0)
+OPENVINO_OP(ShapeOf, ngraph::op::v3)
+OPENVINO_OP(Assign, ngraph::op::v3)
+OPENVINO_OP(ReadValue, ngraph::op::v3)
+OPENVINO_OP(TopK, ngraph::op::v3)
+
+// New operations added in opset4
+OPENVINO_OP(Acosh, ngraph::op::v3)
+OPENVINO_OP(Asinh, ngraph::op::v3)
+OPENVINO_OP(Atanh, ngraph::op::v3)
+OPENVINO_OP(CTCLoss, ngraph::op::v4)
+OPENVINO_OP(HSwish, ngraph::op::v4)
+OPENVINO_OP(Interpolate, ngraph::op::v4)
+OPENVINO_OP(Mish, ngraph::op::v4)
+OPENVINO_OP(ReduceL1, ngraph::op::v4)
+OPENVINO_OP(ReduceL2, ngraph::op::v4)
+OPENVINO_OP(SoftPlus, ngraph::op::v4)
+OPENVINO_OP(Swish, ngraph::op::v4)
+
+// New operations added in opset5
+OPENVINO_OP(GatherND, ngraph::op::v5)
+OPENVINO_OP(GRUSequence, ngraph::op::v5)
+OPENVINO_OP(HSigmoid, ngraph::op::v5)
+OPENVINO_OP(LogSoftmax, ngraph::op::v5)
+OPENVINO_OP(Loop, ngraph::op::v5)
+OPENVINO_OP(LSTMSequence, ngraph::op::v5)
+OPENVINO_OP(NonMaxSuppression, ngraph::op::v5)
+OPENVINO_OP(RNNSequence, ngraph::op::v5)
+OPENVINO_OP(Round, ngraph::op::v5)
diff --git a/ngraph/core/include/openvino/opsets/opset6.hpp b/ngraph/core/include/openvino/opsets/opset6.hpp
new file mode 100644
index 00000000000..82b792da09a
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset6.hpp
@@ -0,0 +1,15 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include "openvino/op/ops.hpp"
+
+namespace ov {
+namespace opset6 {
+#define OPENVINO_OP(a, b) using b::a;
+#include "openvino/opsets/opset6_tbl.hpp"
+#undef OPENVINO_OP
+}  // namespace opset6
+}  // namespace ov
diff --git a/ngraph/core/include/openvino/opsets/opset6_tbl.hpp b/ngraph/core/include/openvino/opsets/opset6_tbl.hpp
new file mode 100644
index 00000000000..27d04eacd42
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset6_tbl.hpp
@@ -0,0 +1,171 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef OPENVINO_OP
+#    warning "OPENVINO_OP not defined"
+#    define OPENVINO_OP(x, y)
+#endif
+
+OPENVINO_OP(Abs, ngraph::op::v0)
+OPENVINO_OP(Acos, ngraph::op::v0)
+OPENVINO_OP(Add, ngraph::op::v1)
+OPENVINO_OP(Asin, ngraph::op::v0)
+OPENVINO_OP(Atan, ngraph::op::v0)
+OPENVINO_OP(AvgPool, ngraph::op::v1)
+OPENVINO_OP(BatchNormInference, ngraph::op::v5)
+OPENVINO_OP(BinaryConvolution, ngraph::op::v1)
+OPENVINO_OP(Broadcast, ngraph::op::v3)
+OPENVINO_OP(Bucketize, ngraph::op::v3)
+OPENVINO_OP(CTCGreedyDecoder, ngraph::op::v0)
+OPENVINO_OP(Ceiling, ngraph::op::v0)
+OPENVINO_OP(Clamp, ngraph::op::v0)
+OPENVINO_OP(Concat, ngraph::op::v0)
+OPENVINO_OP(Constant, ngraph::op)
+OPENVINO_OP(Convert, ngraph::op::v0)
+OPENVINO_OP(ConvertLike, ngraph::op::v1)
+OPENVINO_OP(Convolution, ngraph::op::v1)
+OPENVINO_OP(ConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(Cos, ngraph::op::v0)
+OPENVINO_OP(Cosh, ngraph::op::v0)
+OPENVINO_OP(CumSum, ngraph::op::v0)
+OPENVINO_OP(DeformableConvolution, ngraph::op::v1)
+OPENVINO_OP(DeformablePSROIPooling, ngraph::op::v1)
+OPENVINO_OP(DepthToSpace, ngraph::op::v0)
+OPENVINO_OP(DetectionOutput, ngraph::op::v0)
+OPENVINO_OP(Divide, ngraph::op::v1)
+OPENVINO_OP(Elu, ngraph::op::v0)
+OPENVINO_OP(Erf, ngraph::op::v0)
+OPENVINO_OP(Equal, ngraph::op::v1)
+OPENVINO_OP(Exp, ngraph::op::v0)
+OPENVINO_OP(ExtractImagePatches, ngraph::op::v3)
+OPENVINO_OP(FakeQuantize, ngraph::op::v0)
+OPENVINO_OP(Floor, ngraph::op::v0)
+OPENVINO_OP(FloorMod, ngraph::op::v1)
+OPENVINO_OP(Gather, ngraph::op::v1)
+OPENVINO_OP(GatherTree, ngraph::op::v1)
+OPENVINO_OP(Greater, ngraph::op::v1)
+OPENVINO_OP(GreaterEqual, ngraph::op::v1)
+OPENVINO_OP(GroupConvolution, ngraph::op::v1)
+OPENVINO_OP(GroupConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(GRN, ngraph::op::v0)
+OPENVINO_OP(HardSigmoid, ngraph::op::v0)
+OPENVINO_OP(Less, ngraph::op::v1)
+OPENVINO_OP(LessEqual, ngraph::op::v1)
+OPENVINO_OP(Log, ngraph::op::v0)
+OPENVINO_OP(LogicalAnd, ngraph::op::v1)
+OPENVINO_OP(LogicalNot, ngraph::op::v1)
+OPENVINO_OP(LogicalOr, ngraph::op::v1)
+OPENVINO_OP(LogicalXor, ngraph::op::v1)
+OPENVINO_OP(LRN, ngraph::op::v0)
+OPENVINO_OP(LSTMCell, ngraph::op::v4)
+OPENVINO_OP(MatMul, ngraph::op::v0)
+OPENVINO_OP(MaxPool, ngraph::op::v1)
+OPENVINO_OP(Maximum, ngraph::op::v1)
+OPENVINO_OP(Minimum, ngraph::op::v1)
+OPENVINO_OP(Mod, ngraph::op::v1)
+OPENVINO_OP(Multiply, ngraph::op::v1)
+OPENVINO_OP(Negative, ngraph::op::v0)
+OPENVINO_OP(NormalizeL2, ngraph::op::v0)
+OPENVINO_OP(NotEqual, ngraph::op::v1)
+OPENVINO_OP(OneHot, ngraph::op::v1)
+OPENVINO_OP(PRelu, ngraph::op::v0)
+OPENVINO_OP(PSROIPooling, ngraph::op::v0)
+OPENVINO_OP(Pad, ngraph::op::v1)
+OPENVINO_OP(Parameter, ngraph::op::v0)
+OPENVINO_OP(Power, ngraph::op::v1)
+OPENVINO_OP(PriorBox, ngraph::op::v0)
+OPENVINO_OP(PriorBoxClustered, ngraph::op::v0)
+OPENVINO_OP(Proposal, ngraph::op::v4)
+OPENVINO_OP(Range, ngraph::op::v4)
+OPENVINO_OP(Relu, ngraph::op::v0)
+OPENVINO_OP(ReduceMax, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalAnd, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalOr, ngraph::op::v1)
+OPENVINO_OP(ReduceMean, ngraph::op::v1)
+OPENVINO_OP(ReduceMin, ngraph::op::v1)
+OPENVINO_OP(ReduceProd, ngraph::op::v1)
+OPENVINO_OP(ReduceSum, ngraph::op::v1)
+OPENVINO_OP(RegionYolo, ngraph::op::v0)
+OPENVINO_OP(ReorgYolo, ngraph::op::v0)
+OPENVINO_OP(Reshape, ngraph::op::v1)
+OPENVINO_OP(Result, ngraph::op::v0)
+OPENVINO_OP(ReverseSequence, ngraph::op::v0)
+OPENVINO_OP(ROIPooling, ngraph::op::v0)
+OPENVINO_OP(ScatterNDUpdate, ngraph::op::v3)
+OPENVINO_OP(Select, ngraph::op::v1)
+OPENVINO_OP(Selu, ngraph::op::v0)
+OPENVINO_OP(Sign, ngraph::op::v0)
+OPENVINO_OP(Sigmoid, ngraph::op::v0)
+OPENVINO_OP(Sin, ngraph::op::v0)
+OPENVINO_OP(Sinh, ngraph::op::v0)
+OPENVINO_OP(Softmax, ngraph::op::v1)
+OPENVINO_OP(Sqrt, ngraph::op::v0)
+OPENVINO_OP(SpaceToDepth, ngraph::op::v0)
+OPENVINO_OP(Split, ngraph::op::v1)
+OPENVINO_OP(SquaredDifference, ngraph::op::v0)
+OPENVINO_OP(Squeeze, ngraph::op::v0)
+OPENVINO_OP(StridedSlice, ngraph::op::v1)
+OPENVINO_OP(Subtract, ngraph::op::v1)
+OPENVINO_OP(Tan, ngraph::op::v0)
+OPENVINO_OP(Tanh, ngraph::op::v0)
+OPENVINO_OP(TensorIterator, ngraph::op::v0)
+OPENVINO_OP(Tile, ngraph::op::v0)
+OPENVINO_OP(Transpose, ngraph::op::v1)
+OPENVINO_OP(Unsqueeze, ngraph::op::v0)
+OPENVINO_OP(VariadicSplit, ngraph::op::v1)
+
+// New operations added in opset2
+OPENVINO_OP(Gelu, ngraph::op::v0)
+OPENVINO_OP(BatchToSpace, ngraph::op::v1)
+OPENVINO_OP(SpaceToBatch, ngraph::op::v1)
+
+// New operations added in opset3
+OPENVINO_OP(EmbeddingBagPackedSum, ngraph::op::v3)
+OPENVINO_OP(EmbeddingSegmentsSum, ngraph::op::v3)
+OPENVINO_OP(EmbeddingBagOffsetsSum, ngraph::op::v3)
+OPENVINO_OP(GRUCell, ngraph::op::v3)
+OPENVINO_OP(NonZero, ngraph::op::v3)
+OPENVINO_OP(RNNCell, ngraph::op::v0)
+OPENVINO_OP(ROIAlign, ngraph::op::v3)
+OPENVINO_OP(ScatterElementsUpdate, ngraph::op::v3)
+OPENVINO_OP(ScatterUpdate, ngraph::op::v3)
+OPENVINO_OP(ShuffleChannels, ngraph::op::v0)
+OPENVINO_OP(ShapeOf, ngraph::op::v3)
+OPENVINO_OP(TopK, ngraph::op::v3)
+
+// New operations added in opset4
+OPENVINO_OP(Acosh, ngraph::op::v3)
+OPENVINO_OP(Asinh, ngraph::op::v3)
+OPENVINO_OP(Atanh, ngraph::op::v3)
+OPENVINO_OP(CTCLoss, ngraph::op::v4)
+OPENVINO_OP(HSwish, ngraph::op::v4)
+OPENVINO_OP(Interpolate, ngraph::op::v4)
+OPENVINO_OP(Mish, ngraph::op::v4)
+OPENVINO_OP(ReduceL1, ngraph::op::v4)
+OPENVINO_OP(ReduceL2, ngraph::op::v4)
+OPENVINO_OP(SoftPlus, ngraph::op::v4)
+OPENVINO_OP(Swish, ngraph::op::v4)
+
+// New operations added in opset5
+OPENVINO_OP(GatherND, ngraph::op::v5)
+OPENVINO_OP(GRUSequence, ngraph::op::v5)
+OPENVINO_OP(HSigmoid, ngraph::op::v5)
+OPENVINO_OP(LogSoftmax, ngraph::op::v5)
+OPENVINO_OP(Loop, ngraph::op::v5)
+OPENVINO_OP(LSTMSequence, ngraph::op::v5)
+OPENVINO_OP(NonMaxSuppression, ngraph::op::v5)
+OPENVINO_OP(RNNSequence, ngraph::op::v5)
+OPENVINO_OP(Round, ngraph::op::v5)
+
+// New operations added in opset6
+OPENVINO_OP(CTCGreedyDecoderSeqLen, ngraph::op::v6)
+OPENVINO_OP(ExperimentalDetectronDetectionOutput, ngraph::op::v6)
+OPENVINO_OP(ExperimentalDetectronGenerateProposalsSingleImage, ngraph::op::v6)
+OPENVINO_OP(ExperimentalDetectronPriorGridGenerator, ngraph::op::v6)
+OPENVINO_OP(ExperimentalDetectronROIFeatureExtractor, ngraph::op::v6)
+OPENVINO_OP(ExperimentalDetectronTopKROIs, ngraph::op::v6)
+OPENVINO_OP(GatherElements, ngraph::op::v6)
+OPENVINO_OP(MVN, ngraph::op::v6)
+OPENVINO_OP(Assign, ngraph::op::v6)     // new version
+OPENVINO_OP(ReadValue, ngraph::op::v6)  // new version
diff --git a/ngraph/core/include/openvino/opsets/opset7.hpp b/ngraph/core/include/openvino/opsets/opset7.hpp
new file mode 100644
index 00000000000..87343585747
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset7.hpp
@@ -0,0 +1,15 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include "openvino/op/ops.hpp"
+
+namespace ov {
+namespace opset7 {
+#define OPENVINO_OP(a, b) using b::a;
+#include "openvino/opsets/opset7_tbl.hpp"
+#undef OPENVINO_OP
+}  // namespace opset7
+}  // namespace ov
diff --git a/ngraph/core/include/openvino/opsets/opset7_tbl.hpp b/ngraph/core/include/openvino/opsets/opset7_tbl.hpp
new file mode 100644
index 00000000000..7804a8dfe7e
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset7_tbl.hpp
@@ -0,0 +1,177 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef OPENVINO_OP
+#    warning "OPENVINO_OP not defined"
+#    define OPENVINO_OP(x, y)
+#endif
+
+OPENVINO_OP(Abs, ngraph::op::v0)
+OPENVINO_OP(Acos, ngraph::op::v0)
+OPENVINO_OP(Add, ngraph::op::v1)
+OPENVINO_OP(Asin, ngraph::op::v0)
+OPENVINO_OP(Atan, ngraph::op::v0)
+OPENVINO_OP(AvgPool, ngraph::op::v1)
+OPENVINO_OP(BatchNormInference, ngraph::op::v5)
+OPENVINO_OP(BinaryConvolution, ngraph::op::v1)
+OPENVINO_OP(Broadcast, ngraph::op::v3)
+OPENVINO_OP(Bucketize, ngraph::op::v3)
+OPENVINO_OP(CTCGreedyDecoder, ngraph::op::v0)
+OPENVINO_OP(Ceiling, ngraph::op::v0)
+OPENVINO_OP(Clamp, ngraph::op::v0)
+OPENVINO_OP(Concat, ngraph::op::v0)
+OPENVINO_OP(Constant, ngraph::op)
+OPENVINO_OP(Convert, ngraph::op::v0)
+OPENVINO_OP(ConvertLike, ngraph::op::v1)
+OPENVINO_OP(Convolution, ngraph::op::v1)
+OPENVINO_OP(ConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(Cos, ngraph::op::v0)
+OPENVINO_OP(Cosh, ngraph::op::v0)
+OPENVINO_OP(CumSum, ngraph::op::v0)
+OPENVINO_OP(DeformableConvolution, ngraph::op::v1)
+OPENVINO_OP(DeformablePSROIPooling, ngraph::op::v1)
+OPENVINO_OP(DepthToSpace, ngraph::op::v0)
+OPENVINO_OP(DetectionOutput, ngraph::op::v0)
+OPENVINO_OP(Divide, ngraph::op::v1)
+OPENVINO_OP(Elu, ngraph::op::v0)
+OPENVINO_OP(Erf, ngraph::op::v0)
+OPENVINO_OP(Equal, ngraph::op::v1)
+OPENVINO_OP(Exp, ngraph::op::v0)
+OPENVINO_OP(ExtractImagePatches, ngraph::op::v3)
+OPENVINO_OP(FakeQuantize, ngraph::op::v0)
+OPENVINO_OP(Floor, ngraph::op::v0)
+OPENVINO_OP(FloorMod, ngraph::op::v1)
+OPENVINO_OP(Gather, ngraph::op::v7)
+OPENVINO_OP(GatherTree, ngraph::op::v1)
+OPENVINO_OP(Greater, ngraph::op::v1)
+OPENVINO_OP(GreaterEqual, ngraph::op::v1)
+OPENVINO_OP(GroupConvolution, ngraph::op::v1)
+OPENVINO_OP(GroupConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(GRN, ngraph::op::v0)
+OPENVINO_OP(HardSigmoid, ngraph::op::v0)
+OPENVINO_OP(Less, ngraph::op::v1)
+OPENVINO_OP(LessEqual, ngraph::op::v1)
+OPENVINO_OP(Log, ngraph::op::v0)
+OPENVINO_OP(LogicalAnd, ngraph::op::v1)
+OPENVINO_OP(LogicalNot, ngraph::op::v1)
+OPENVINO_OP(LogicalOr, ngraph::op::v1)
+OPENVINO_OP(LogicalXor, ngraph::op::v1)
+OPENVINO_OP(LRN, ngraph::op::v0)
+OPENVINO_OP(LSTMCell, ngraph::op::v4)
+OPENVINO_OP(MatMul, ngraph::op::v0)
+OPENVINO_OP(MaxPool, ngraph::op::v1)
+OPENVINO_OP(Maximum, ngraph::op::v1)
+OPENVINO_OP(Minimum, ngraph::op::v1)
+OPENVINO_OP(Mod, ngraph::op::v1)
+OPENVINO_OP(Multiply, ngraph::op::v1)
+OPENVINO_OP(Negative, ngraph::op::v0)
+OPENVINO_OP(NormalizeL2, ngraph::op::v0)
+OPENVINO_OP(NotEqual, ngraph::op::v1)
+OPENVINO_OP(OneHot, ngraph::op::v1)
+OPENVINO_OP(PRelu, ngraph::op::v0)
+OPENVINO_OP(PSROIPooling, ngraph::op::v0)
+OPENVINO_OP(Pad, ngraph::op::v1)
+OPENVINO_OP(Parameter, ngraph::op::v0)
+OPENVINO_OP(Power, ngraph::op::v1)
+OPENVINO_OP(PriorBox, ngraph::op::v0)
+OPENVINO_OP(PriorBoxClustered, ngraph::op::v0)
+OPENVINO_OP(Proposal, ngraph::op::v4)
+OPENVINO_OP(Range, ngraph::op::v4)
+OPENVINO_OP(Relu, ngraph::op::v0)
+OPENVINO_OP(ReduceMax, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalAnd, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalOr, ngraph::op::v1)
+OPENVINO_OP(ReduceMean, ngraph::op::v1)
+OPENVINO_OP(ReduceMin, ngraph::op::v1)
+OPENVINO_OP(ReduceProd, ngraph::op::v1)
+OPENVINO_OP(ReduceSum, ngraph::op::v1)
+OPENVINO_OP(RegionYolo, ngraph::op::v0)
+OPENVINO_OP(ReorgYolo, ngraph::op::v0)
+OPENVINO_OP(Reshape, ngraph::op::v1)
+OPENVINO_OP(Result, ngraph::op::v0)
+OPENVINO_OP(ReverseSequence, ngraph::op::v0)
+OPENVINO_OP(ROIPooling, ngraph::op::v0)
+OPENVINO_OP(ScatterNDUpdate, ngraph::op::v3)
+OPENVINO_OP(Select, ngraph::op::v1)
+OPENVINO_OP(Selu, ngraph::op::v0)
+OPENVINO_OP(Sign, ngraph::op::v0)
+OPENVINO_OP(Sigmoid, ngraph::op::v0)
+OPENVINO_OP(Sin, ngraph::op::v0)
+OPENVINO_OP(Sinh, ngraph::op::v0)
+OPENVINO_OP(Softmax, ngraph::op::v1)
+OPENVINO_OP(Sqrt, ngraph::op::v0)
+OPENVINO_OP(SpaceToDepth, ngraph::op::v0)
+OPENVINO_OP(Split, ngraph::op::v1)
+OPENVINO_OP(SquaredDifference, ngraph::op::v0)
+OPENVINO_OP(Squeeze, ngraph::op::v0)
+OPENVINO_OP(StridedSlice, ngraph::op::v1)
+OPENVINO_OP(Subtract, ngraph::op::v1)
+OPENVINO_OP(Tan, ngraph::op::v0)
+OPENVINO_OP(Tanh, ngraph::op::v0)
+OPENVINO_OP(TensorIterator, ngraph::op::v0)
+OPENVINO_OP(Tile, ngraph::op::v0)
+OPENVINO_OP(Transpose, ngraph::op::v1)
+OPENVINO_OP(Unsqueeze, ngraph::op::v0)
+OPENVINO_OP(VariadicSplit, ngraph::op::v1)
+
+// New operations added in opset2
+OPENVINO_OP(BatchToSpace, ngraph::op::v1)
+OPENVINO_OP(SpaceToBatch, ngraph::op::v1)
+
+// New operations added in opset3
+OPENVINO_OP(EmbeddingBagPackedSum, ngraph::op::v3)
+OPENVINO_OP(EmbeddingSegmentsSum, ngraph::op::v3)
+OPENVINO_OP(EmbeddingBagOffsetsSum, ngraph::op::v3)
+OPENVINO_OP(GRUCell, ngraph::op::v3)
+OPENVINO_OP(NonZero, ngraph::op::v3)
+OPENVINO_OP(RNNCell, ngraph::op::v0)
+OPENVINO_OP(ROIAlign, ngraph::op::v3)
+OPENVINO_OP(ScatterElementsUpdate, ngraph::op::v3)
+OPENVINO_OP(ScatterUpdate, ngraph::op::v3)
+OPENVINO_OP(ShuffleChannels, ngraph::op::v0)
+OPENVINO_OP(ShapeOf, ngraph::op::v3)
+OPENVINO_OP(TopK, ngraph::op::v3)
+
+// New operations added in opset4
+OPENVINO_OP(Acosh, ngraph::op::v3)
+OPENVINO_OP(Asinh, ngraph::op::v3)
+OPENVINO_OP(Atanh, ngraph::op::v3)
+OPENVINO_OP(CTCLoss, ngraph::op::v4)
+OPENVINO_OP(HSwish, ngraph::op::v4)
+OPENVINO_OP(Interpolate, ngraph::op::v4)
+OPENVINO_OP(Mish, ngraph::op::v4)
+OPENVINO_OP(ReduceL1, ngraph::op::v4)
+OPENVINO_OP(ReduceL2, ngraph::op::v4)
+OPENVINO_OP(SoftPlus, ngraph::op::v4)
+OPENVINO_OP(Swish, ngraph::op::v4)
+
+// New operations added in opset5
+OPENVINO_OP(GatherND, ngraph::op::v5)
+OPENVINO_OP(GRUSequence, ngraph::op::v5)
+OPENVINO_OP(HSigmoid, ngraph::op::v5)
+OPENVINO_OP(LogSoftmax, ngraph::op::v5)
+OPENVINO_OP(Loop, ngraph::op::v5)
+OPENVINO_OP(LSTMSequence, ngraph::op::v5)
+OPENVINO_OP(NonMaxSuppression, ngraph::op::v5)
+OPENVINO_OP(RNNSequence, ngraph::op::v5)
+OPENVINO_OP(Round, ngraph::op::v5)
+
+// New operations added in opset6
+OPENVINO_OP(CTCGreedyDecoderSeqLen, ngraph::op::v6)
+OPENVINO_OP(ExperimentalDetectronDetectionOutput, ngraph::op::v6)
+OPENVINO_OP(ExperimentalDetectronGenerateProposalsSingleImage, ngraph::op::v6)
+OPENVINO_OP(ExperimentalDetectronPriorGridGenerator, ngraph::op::v6)
+OPENVINO_OP(ExperimentalDetectronROIFeatureExtractor, ngraph::op::v6)
+OPENVINO_OP(ExperimentalDetectronTopKROIs, ngraph::op::v6)
+OPENVINO_OP(GatherElements, ngraph::op::v6)
+OPENVINO_OP(MVN, ngraph::op::v6)
+OPENVINO_OP(Assign, ngraph::op::v6)     // new version
+OPENVINO_OP(ReadValue, ngraph::op::v6)  // new version
+
+// New operations added in opset7
+OPENVINO_OP(DFT, ngraph::op::v7)
+OPENVINO_OP(Einsum, ngraph::op::v7)
+OPENVINO_OP(Gelu, ngraph::op::v7)
+OPENVINO_OP(IDFT, ngraph::op::v7)
+OPENVINO_OP(Roll, ngraph::op::v7)
diff --git a/ngraph/core/include/openvino/opsets/opset8.hpp b/ngraph/core/include/openvino/opsets/opset8.hpp
new file mode 100644
index 00000000000..c41f5fb8af6
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset8.hpp
@@ -0,0 +1,15 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#pragma once
+
+#include "openvino/op/ops.hpp"
+
+namespace ov {
+namespace opset8 {
+#define OPENVINO_OP(a, b) using b::a;
+#include "openvino/opsets/opset8_tbl.hpp"
+#undef OPENVINO_OP
+}  // namespace opset8
+}  // namespace ov
diff --git a/ngraph/core/include/openvino/opsets/opset8_tbl.hpp b/ngraph/core/include/openvino/opsets/opset8_tbl.hpp
new file mode 100644
index 00000000000..be2b7c303de
--- /dev/null
+++ b/ngraph/core/include/openvino/opsets/opset8_tbl.hpp
@@ -0,0 +1,185 @@
+// Copyright (C) 2018-2021 Intel Corporation
+// SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef OPENVINO_OP
+#    warning "OPENVINO_OP not defined"
+#    define OPENVINO_OP(x, y)
+#endif
+
+OPENVINO_OP(Abs, ngraph::op::v0)
+OPENVINO_OP(Acos, ngraph::op::v0)
+OPENVINO_OP(Add, ngraph::op::v1)
+OPENVINO_OP(Asin, ngraph::op::v0)
+OPENVINO_OP(Atan, ngraph::op::v0)
+OPENVINO_OP(AvgPool, ngraph::op::v1)
+OPENVINO_OP(BatchNormInference, ngraph::op::v5)
+OPENVINO_OP(BinaryConvolution, ngraph::op::v1)
+OPENVINO_OP(Broadcast, ngraph::op::v3)
+OPENVINO_OP(Bucketize, ngraph::op::v3)
+OPENVINO_OP(CTCGreedyDecoder, ngraph::op::v0)
+OPENVINO_OP(Ceiling, ngraph::op::v0)
+OPENVINO_OP(Clamp, ngraph::op::v0)
+OPENVINO_OP(Concat, ngraph::op::v0)
+OPENVINO_OP(Constant, ngraph::op)
+OPENVINO_OP(Convert, ngraph::op::v0)
+OPENVINO_OP(ConvertLike, ngraph::op::v1)
+OPENVINO_OP(Convolution, ngraph::op::v1)
+OPENVINO_OP(ConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(Cos, ngraph::op::v0)
+OPENVINO_OP(Cosh, ngraph::op::v0)
+OPENVINO_OP(CumSum, ngraph::op::v0)
+OPENVINO_OP(DeformablePSROIPooling, ngraph::op::v1)
+OPENVINO_OP(DepthToSpace, ngraph::op::v0)
+OPENVINO_OP(DetectionOutput, ngraph::op::v0)
+OPENVINO_OP(Divide, ngraph::op::v1)
+OPENVINO_OP(Elu, ngraph::op::v0)
+OPENVINO_OP(Erf, ngraph::op::v0)
+OPENVINO_OP(Equal, ngraph::op::v1)
+OPENVINO_OP(Exp, ngraph::op::v0)
+OPENVINO_OP(ExtractImagePatches, ngraph::op::v3)
+OPENVINO_OP(FakeQuantize, ngraph::op::v0)
+OPENVINO_OP(Floor, ngraph::op::v0)
+OPENVINO_OP(FloorMod, ngraph::op::v1)
+OPENVINO_OP(GatherTree, ngraph::op::v1)
+OPENVINO_OP(Greater, ngraph::op::v1)
+OPENVINO_OP(GreaterEqual, ngraph::op::v1)
+OPENVINO_OP(GroupConvolution, ngraph::op::v1)
+OPENVINO_OP(GroupConvolutionBackpropData, ngraph::op::v1)
+OPENVINO_OP(GRN, ngraph::op::v0)
+OPENVINO_OP(HardSigmoid, ngraph::op::v0)
+OPENVINO_OP(Less, ngraph::op::v1)
+OPENVINO_OP(LessEqual, ngraph::op::v1)
+OPENVINO_OP(Log, ngraph::op::v0)
+OPENVINO_OP(LogicalAnd, ngraph::op::v1)
+OPENVINO_OP(LogicalNot, ngraph::op::v1)
+OPENVINO_OP(LogicalOr, ngraph::op::v1)
+OPENVINO_OP(LogicalXor, ngraph::op::v1)
+OPENVINO_OP(LRN, ngraph::op::v0)
+OPENVINO_OP(LSTMCell, ngraph::op::v4)
+OPENVINO_OP(MatMul, ngraph::op::v0)
+OPENVINO_OP(Maximum, ngraph::op::v1)
+OPENVINO_OP(Minimum, ngraph::op::v1)
+OPENVINO_OP(Mod, ngraph::op::v1)
+OPENVINO_OP(Multiply, ngraph::op::v1)
+OPENVINO_OP(Negative, ngraph::op::v0)
+OPENVINO_OP(NormalizeL2, ngraph::op::v0)
+OPENVINO_OP(NotEqual, ngraph::op::v1)
+OPENVINO_OP(OneHot, ngraph::op::v1)
+OPENVINO_OP(PRelu, ngraph::op::v0)
+OPENVINO_OP(PSROIPooling, ngraph::op::v0)
+OPENVINO_OP(Pad, ngraph::op::v1)
+OPENVINO_OP(Parameter, ngraph::op::v0)
+OPENVINO_OP(Power, ngraph::op::v1)
+OPENVINO_OP(PriorBox, ngraph::op::v0)
+OPENVINO_OP(PriorBoxClustered, ngraph::op::v0)
+OPENVINO_OP(Proposal, ngraph::op::v4)
+OPENVINO_OP(Range, ngraph::op::v4)
+OPENVINO_OP(Relu, ngraph::op::v0)
+OPENVINO_OP(ReduceMax, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalAnd, ngraph::op::v1)
+OPENVINO_OP(ReduceLogicalOr, ngraph::op::v1)
+OPENVINO_OP(ReduceMean, ngraph::op::v1)
+OPENVINO_OP(ReduceMin, ngraph::op::v1)
+OPENVINO_OP(ReduceProd, ngraph::op::v1)
+OPENVINO_OP(ReduceSum, ngraph::op::v1)
+OPENVINO_OP(RegionYolo, ngraph::op::v0)
+OPENVINO_OP(ReorgYolo, ngraph::op::v0)
+OPENVINO_OP(Reshape, ngraph::op::v1)
+OPENVINO_OP(Result, ngraph::op::v0)
+OPENVINO_OP(ReverseSequence, ngraph::op::v0)
+OPENVINO_OP(ROIPooling, ngraph::op::v0)
+OPENVINO_OP(ScatterNDUpdate, ngraph::op::v3)
+OPENVINO_OP(Select, ngraph::op::v1)
+OPENVINO_OP(Selu, ngraph::op::v0)
+OPENVINO_OP(Sign, ngraph::op::v0)
+OPENVINO_OP(Sigmoid, ngraph::op::v0)
+OPENVINO_OP(Sin, ngraph::op::v0)
+OPENVINO_OP(Sinh, ngraph::op::v0)
+OPENVINO_OP(Softmax, ngraph::op::v1)
+OPENVINO_OP(Sqrt, ngraph::op::v0)
+OPENVINO_OP(SpaceToDepth, ngraph::op::v0)
+OPENVINO_OP(Split, ngraph::op::v1)
+OPENVINO_OP(SquaredDifference, ngraph::op::v0)
+OPENVINO_OP(Squeeze, ngraph::op::v0)
+OPENVINO_OP(StridedSlice, ngraph::op::v1)
+OPENVINO_OP(Subtract, ngraph::op::v1)
+OPENVINO_OP(Tan, ngraph::op::v0)
+OPENVINO_OP(Tanh, ngraph::op::v0)
+OPENVINO_OP(TensorIterator, ngraph::op::v0)
+OPENVINO_OP(Tile, ngraph::op::v0)
+OPENVINO_OP(Transpose, ngraph::op::v1)
+OPENVINO_OP(Unsqueeze, ngraph::op::v0)
+OPENVINO_OP(VariadicSplit, ngraph::op::v1)
+
+// New operations added in opset2
+OPENVINO_OP(BatchToSpace, ngraph::op::v1)
+OPENVINO_OP(SpaceToBatch, ngraph::op::v1)
+
+// New operations added in opset3
+OPENVINO_OP(EmbeddingBagPackedSum, ngraph::op::v3)
+OPENVINO_OP(EmbeddingSegmentsSum, ngraph::op::v3)
+OPENVINO_OP(EmbeddingBagOffsetsSum, ngraph::op::v3)
+OPENVINO_OP(GRUCell, ngraph::op::v3)
+OPENVINO_OP(NonZero, ngraph::op::v3)
+OPENVINO_OP(RNNCell, ngraph::op::v0)
+OPENVINO_OP(ROIAlign, ngraph::op::v3)
+OPENVINO_OP(ScatterElementsUpdate, ngraph::op::v3)
+OPENVINO_OP(ScatterUpdate, ngraph::op::v3)
+OPENVINO_OP(ShuffleChannels, ngraph::op::v0)
+OPENVINO_OP(ShapeOf, ngraph::op::v3)
+OPENVINO_OP(TopK, ngraph::op::v3)
+
+// New operations added in opset4
+OPENVINO_OP(Acosh, ngraph::op::v3)
+OPENVINO_OP(Asinh, ngraph::op::v3)
+OPENVINO_OP(Atanh, ngraph::op::v3)
+OPENVINO_OP(CTCLoss, ngraph::op::v4)
+OPENVINO_OP(HSwish, ngraph::op::v4)
+OPENVINO_OP(Interpolate, ngraph::op::v4)
+OPENVINO_OP(Mish, ngraph::op::v4)
+OPENVINO_OP(ReduceL1, ngraph::op::v4)
+OPENVINO_OP(ReduceL2, ngraph::op::v4)
+OPENVINO_OP(SoftPlus, ngraph::op::v4)
+OPENVINO_OP(Swish, ngraph::op::v4)
+
+// New operations added in opset5
+OPENVINO_OP(GatherND, ngraph::op::v5)
+OPENVINO_OP(GRUSequence, ngraph::op::v5)
+OPENVINO_OP(HSigmoid, ngraph::op::v5)
+OPENVINO_OP(LogSoftmax, ngraph::op::v5)
+OPENVINO_OP(Loop, ngraph::op::v5)
+OPENVINO_OP(LSTMSequence, ngraph::op::v5)
+OPENVINO_OP(NonMaxSuppression, ngraph::op::v5)
+OPENVINO_OP(RNNSequence, ngraph::op::v5)
+OPENVINO_OP(Round, ngraph::op::v5)
+
+// New operations added in opset6
+OPENVINO_OP(CTCGreedyDecoderSeqLen, ngraph::op::v6)
+OPENVINO_OP(ExperimentalDetectronDetectionOutput, ngraph::op::v6)
+OPENVINO_OP(ExperimentalDetectronGenerateProposalsSingleImage, ngraph::op::v6)
+OPENVINO_OP(ExperimentalDetectronPriorGridGenerator, ngraph::op::v6)
+OPENVINO_OP(ExperimentalDetectronROIFeatureExtractor, ngraph::op::v6)
+OPENVINO_OP(ExperimentalDetectronTopKROIs, ngraph::op::v6)
+OPENVINO_OP(GatherElements, ngraph::op::v6)
+OPENVINO_OP(MVN, ngraph::op::v6)
+OPENVINO_OP(Assign, ngraph::op::v6)     // new version
+OPENVINO_OP(ReadValue, ngraph::op::v6)  // new version
+
+// New operations added in opset7
+OPENVINO_OP(DFT, ngraph::op::v7)
+OPENVINO_OP(Einsum, ngraph::op::v7)
+OPENVINO_OP(Gelu, ngraph::op::v7)
+OPENVINO_OP(IDFT, ngraph::op::v7)
+OPENVINO_OP(Roll, ngraph::op::v7)
+
+// New operations added in opset8
+OPENVINO_OP(Gather, ngraph::op::v8)
+OPENVINO_OP(AdaptiveAvgPool, ngraph::op::v8)
+OPENVINO_OP(AdaptiveMaxPool, ngraph::op::v8)
+OPENVINO_OP(DeformableConvolution, ngraph::op::v8)
+OPENVINO_OP(MatrixNms, ngraph::op::v8)
+OPENVINO_OP(MaxPool, ngraph::op::v8)
+OPENVINO_OP(MulticlassNms, ngraph::op::v8)
+OPENVINO_OP(RandomUniform, ngraph::op::v8)
+OPENVINO_OP(If, ngraph::op::v8)
diff --git a/ngraph/core/src/opsets/opset.cpp b/ngraph/core/src/opsets/opset.cpp
index b9a67b10427..72a23e9f74b 100644
--- a/ngraph/core/src/opsets/opset.cpp
+++ b/ngraph/core/src/opsets/opset.cpp
@@ -7,12 +7,14 @@
 #include "ngraph/log.hpp"
 #include "ngraph/ops.hpp"
 
-std::mutex& ngraph::OpSet::get_mutex() {
+ngraph::OpSet::OpSet(const ov::OpSet& opset) : ov::OpSet(opset) {}
+
+std::mutex& ov::OpSet::get_mutex() {
     static std::mutex opset_mutex;
     return opset_mutex;
 }
 
-ngraph::Node* ngraph::OpSet::create(const std::string& name) const {
+ov::Node* ov::OpSet::create(const std::string& name) const {
     auto type_info_it = m_name_type_info_map.find(name);
     if (type_info_it == m_name_type_info_map.end()) {
         NGRAPH_WARN << "Couldn't create operator of type: " << name << " . Operation not registered in opset.";
@@ -21,96 +23,136 @@ ngraph::Node* ngraph::OpSet::create(const std::string& name) const {
     return m_factory_registry.create(type_info_it->second);
 }
 
-ngraph::Node* ngraph::OpSet::create_insensitive(const std::string& name) const {
+ov::Node* ov::OpSet::create_insensitive(const std::string& name) const {
     auto type_info_it = m_case_insensitive_type_info_map.find(to_upper_name(name));
     return type_info_it == m_case_insensitive_type_info_map.end() ? nullptr
                                                                   : m_factory_registry.create(type_info_it->second);
 }
 
-const ngraph::OpSet& ngraph::get_opset1() {
+const ov::OpSet& ov::get_opset1() {
     static OpSet opset;
     static std::once_flag flag;
     std::call_once(flag, [&]() {
-#define NGRAPH_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
-#include "ngraph/opsets/opset1_tbl.hpp"
-#undef NGRAPH_OP
+#define OPENVINO_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
+#include "openvino/opsets/opset1_tbl.hpp"
+#undef OPENVINO_OP
     });
     return opset;
 }
 
+const ov::OpSet& ov::get_opset2() {
+    static OpSet opset;
+    static std::once_flag flag;
+    std::call_once(flag, [&]() {
+#define OPENVINO_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
+#include "openvino/opsets/opset2_tbl.hpp"
+#undef OPENVINO_OP
+    });
+    return opset;
+}
+
+const ov::OpSet& ov::get_opset3() {
+    static OpSet opset;
+    static std::once_flag flag;
+    std::call_once(flag, [&]() {
+#define OPENVINO_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
+#include "openvino/opsets/opset3_tbl.hpp"
+#undef OPENVINO_OP
+    });
+    return opset;
+}
+
+const ov::OpSet& ov::get_opset4() {
+    static OpSet opset;
+    static std::once_flag flag;
+    std::call_once(flag, [&]() {
+#define OPENVINO_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
+#include "openvino/opsets/opset4_tbl.hpp"
+#undef OPENVINO_OP
+    });
+    return opset;
+}
+
+const ov::OpSet& ov::get_opset5() {
+    static OpSet opset;
+    static std::once_flag flag;
+    std::call_once(flag, [&]() {
+#define OPENVINO_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
+#include "openvino/opsets/opset5_tbl.hpp"
+#undef OPENVINO_OP
+    });
+    return opset;
+}
+
+const ov::OpSet& ov::get_opset6() {
+    static OpSet opset;
+    static std::once_flag flag;
+    std::call_once(flag, [&]() {
+#define OPENVINO_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
+#include "openvino/opsets/opset6_tbl.hpp"
+#undef OPENVINO_OP
+    });
+    return opset;
+}
+
+const ov::OpSet& ov::get_opset7() {
+    static OpSet opset;
+    static std::once_flag flag;
+    std::call_once(flag, [&]() {
+#define OPENVINO_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
+#include "openvino/opsets/opset7_tbl.hpp"
+#undef OPENVINO_OP
+    });
+    return opset;
+}
+
+const ov::OpSet& ov::get_opset8() {
+    static OpSet opset;
+    static std::once_flag flag;
+    std::call_once(flag, [&]() {
+#define OPENVINO_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
+#include "openvino/opsets/opset8_tbl.hpp"
+#undef OPENVINO_OP
+    });
+    return opset;
+}
+
+const ngraph::OpSet& ngraph::get_opset1() {
+    static OpSet opset(ov::get_opset1());
+    return opset;
+}
+
 const ngraph::OpSet& ngraph::get_opset2() {
-    static OpSet opset;
-    static std::once_flag flag;
-    std::call_once(flag, [&]() {
-#define NGRAPH_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
-#include "ngraph/opsets/opset2_tbl.hpp"
-#undef NGRAPH_OP
-    });
+    static OpSet opset(ov::get_opset2());
     return opset;
 }
 
 const ngraph::OpSet& ngraph::get_opset3() {
-    static OpSet opset;
-    static std::once_flag flag;
-    std::call_once(flag, [&]() {
-#define NGRAPH_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
-#include "ngraph/opsets/opset3_tbl.hpp"
-#undef NGRAPH_OP
-    });
+    static OpSet opset(ov::get_opset3());
     return opset;
 }
 
 const ngraph::OpSet& ngraph::get_opset4() {
-    static OpSet opset;
-    static std::once_flag flag;
-    std::call_once(flag, [&]() {
-#define NGRAPH_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
-#include "ngraph/opsets/opset4_tbl.hpp"
-#undef NGRAPH_OP
-    });
+    static OpSet opset(ov::get_opset4());
     return opset;
 }
 
 const ngraph::OpSet& ngraph::get_opset5() {
-    static OpSet opset;
-    static std::once_flag flag;
-    std::call_once(flag, [&]() {
-#define NGRAPH_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
-#include "ngraph/opsets/opset5_tbl.hpp"
-#undef NGRAPH_OP
-    });
+    static OpSet opset(ov::get_opset5());
     return opset;
 }
 
 const ngraph::OpSet& ngraph::get_opset6() {
-    static OpSet opset;
-    static std::once_flag flag;
-    std::call_once(flag, [&]() {
-#define NGRAPH_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
-#include "ngraph/opsets/opset6_tbl.hpp"
-#undef NGRAPH_OP
-    });
+    static OpSet opset(ov::get_opset6());
     return opset;
 }
 
 const ngraph::OpSet& ngraph::get_opset7() {
-    static OpSet opset;
-    static std::once_flag flag;
-    std::call_once(flag, [&]() {
-#define NGRAPH_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
-#include "ngraph/opsets/opset7_tbl.hpp"
-#undef NGRAPH_OP
-    });
+    static OpSet opset(ov::get_opset7());
     return opset;
 }
 
 const ngraph::OpSet& ngraph::get_opset8() {
-    static OpSet opset;
-    static std::once_flag flag;
-    std::call_once(flag, [&]() {
-#define NGRAPH_OP(NAME, NAMESPACE) opset.insert<NAMESPACE::NAME>();
-#include "ngraph/opsets/opset8_tbl.hpp"
-#undef NGRAPH_OP
-    });
+    static OpSet opset(ov::get_opset8());
     return opset;
 }
diff --git a/ngraph/frontend/ir/src/model.cpp b/ngraph/frontend/ir/src/model.cpp
index 096e1ebcc65..7ec59eb724b 100644
--- a/ngraph/frontend/ir/src/model.cpp
+++ b/ngraph/frontend/ir/src/model.cpp
@@ -935,4 +935,4 @@ std::shared_ptr<Function> InputModelIR::convert() {
     return function;
 }
 }  // namespace frontend
-}  // namespace ngraph
\ No newline at end of file
+}  // namespace ngraph
diff --git a/ngraph/test/opset1.cpp b/ngraph/test/opset1.cpp
index 7f5a2cfdba3..969944a75d9 100644
--- a/ngraph/test/opset1.cpp
+++ b/ngraph/test/opset1.cpp
@@ -162,7 +162,7 @@ public:
     }
     void validate_and_infer_types() override{};
 
-    virtual std::shared_ptr<Node> clone_with_new_inputs(const OutputVector& /* new_args */) const override {
+    std::shared_ptr<Node> clone_with_new_inputs(const OutputVector& /* new_args */) const override {
         return make_shared<NewOp>();
     };
 };
@@ -173,6 +173,7 @@ TEST(opset, new_op) {
     // Copy opset1; don't bash the real thing in a test
     OpSet opset1_copy(get_opset1());
     opset1_copy.insert<NewOp>();
+    ASSERT_TRUE(opset1_copy.contains_type<NewOp>());
     {
         shared_ptr<Node> op(opset1_copy.create(NewOp::type_info.name));
         ASSERT_TRUE(op);
@@ -193,6 +194,7 @@ TEST(opset, new_op) {
     EXPECT_TRUE(fred);
     // Fred should not be in the registry
     ASSERT_FALSE(get_opset1().contains_type(NewOp::type_info));
+    ASSERT_FALSE(get_opset1().contains_type<NewOp>());
 }
 
 TEST(opset, dump) {