diff --git a/draft-ietf-core-coap-pubsub.md b/draft-ietf-core-coap-pubsub.md
index 735fb6c..ede93c3 100644
--- a/draft-ietf-core-coap-pubsub.md
+++ b/draft-ietf-core-coap-pubsub.md
@@ -47,6 +47,9 @@ informative:
   I-D.hartke-t2trg-coral-pubsub:
   I-D.ietf-ace-oscore-gm-admin:
 
+entity:
+  SELF: "[RFC-XXXX]"
+
 --- abstract
 
 This document describes a publish-subscribe architecture for CoAP that
@@ -791,18 +794,18 @@ Note that the media type application/core-pubsub+cbor MUST be used when these pa
 <!-- TBD: we may take content from prev versions but we have to spend some more time on the implications of the topic-config -->
 TBD.
 
-# IANA Considerations {#iana}
+## Change of topic configuration
 
+## Topic Administrators
 
-<!-- TBD: Redo this section. Need to add the ct and rt similar to the ones below
 
-https://www.ietf.org/archive/id/draft-ietf-ace-oscore-gm-admin-07.html#name-resource-types
+# IANA Considerations {#iana}
 
+<!-- TBD: This section is structured similarly as:
+https://www.ietf.org/archive/id/draft-ietf-ace-oscore-gm-admin-07.html#name-resource-types
 https://www.ietf.org/archive/id/draft-ietf-ace-key-groupcomm-16.html#section-11.1
-
-https://www.ietf.org/archive/id/draft-ietf-ace-key-groupcomm-16.html#section-11.2 -->
-
-# IANA Considerations {#iana}
+https://www.ietf.org/archive/id/draft-ietf-ace-key-groupcomm-16.html#section-11.2
+-->
 
 This document has the following actions for IANA.