diff --git a/VERSION b/VERSION
index 6d6ae0c..3b31fa0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.20
+2.3.21
diff --git a/pyvoltha/adapters/extensions/omci/omci_entities.py b/pyvoltha/adapters/extensions/omci/omci_entities.py
index 930c5d0..f932406 100644
--- a/pyvoltha/adapters/extensions/omci/omci_entities.py
+++ b/pyvoltha/adapters/extensions/omci/omci_entities.py
@@ -977,7 +977,7 @@
     attributes = [
         ECA(ShortField("managed_entity_id", None), {AA.R, AA.SBC},
             range_check=lambda x: x != OmciNullPointer),
-        ECA(ShortField("gem_port_network_ctp_pointer", None), {AA.R, AA.SBC}),
+        ECA(ShortField("gem_port_network_ctp_pointer", None), {AA.R, AA.W, AA.SBC}),
         ECA(ByteField("interworking_option", None), {AA.R, AA.W, AA.SBC},
             range_check=lambda x: x in [0, 1, 3, 5]),
         ECA(ShortField("service_profile_pointer", None), {AA.R, AA.W, AA.SBC}),
@@ -1169,7 +1169,7 @@
         ECA(ShortField("managed_entity_id", None), {AA.R, AA.SBC}),
         ECA(ByteField("me_type", None), {AA.R, AA.W, AA.SBC},
             range_check=lambda x: 0 <= x <= 1),
-        ECA(ShortField("mcast_operations_profile_pointer", None),
+        ECA(ShortField("multicast_operations_profile_pointer", None),
             {AA.R, AA.W, AA.SBC}),
         ECA(ShortField("max_simultaneous_groups", None), {AA.R, AA.W, AA.SBC}),
         ECA(IntField("max_multicast_bandwidth", None), {AA.R, AA.W, AA.SBC}),