diff --git a/rdl/combpm.rdl b/rdl/combpm.rdl
index b9e2bfa56c74562049f4e42d944cfc93e6df98e2..aef838c81aba9f20e40b9b4445bae8c25acc23d1 100644
--- a/rdl/combpm.rdl
+++ b/rdl/combpm.rdl
@@ -1,21 +1,18 @@
 `include "combpm.vh" // Auto generated from FWK
 
 addrmap combpm {
-
-    desyrdl_generate_hdl = true;
-    desyrdl_interface = "AXI4L";
-
     name="BPM protocol decoder controller";
+    desyrdl_interface = "AXI4L";
 
     reg {
         desc="Module identifier.";
         field {hw=w;sw=r;} data[32];
-    } ID;
+    } ID @0x00;
 
     reg {
         desc="Module version.";
         field {hw=w;sw=r;} data[32];
-    } VERSION;
+    } VERSION @0x04;
 
     reg {
         desc="SFP module status";
@@ -113,6 +110,6 @@ addrmap combpm {
         desc = "BPM filter table";
         memwidth = 8;
         mementries = 2**`C_W_ADDR_TABLE;
-    } TABLE;
+    } TABLE @0x200;
 
 };