diff --git a/bau_systemB.cpp b/bau_systemB.cpp
index d09820e..39cdb70 100644
--- a/bau_systemB.cpp
+++ b/bau_systemB.cpp
@@ -2,9 +2,6 @@
 #include <string.h>
 #include <stdio.h>
 
-
-using namespace std;
-
 BauSystemB::BauSystemB(Platform& platform): _memoryReference((uint8_t*)&_deviceObj), _memory(platform), _addrTable(_memoryReference),
     _assocTable(_memoryReference), _groupObjTable(_memoryReference), _appProgram(_memoryReference),
     _platform(platform), _appLayer(_assocTable, *this),
@@ -275,4 +272,9 @@ void BauSystemB::groupValueWriteIndication(uint16_t asap, Priority priority, Hop
         return;
 
     updateGroupObject(go, data, dataLength);
-}
\ No newline at end of file
+}
+
+void BauSystemB::addSaveRestore(SaveRestore* obj)
+{
+    _memory.addSaveRestore(obj);
+}
diff --git a/bau_systemB.h b/bau_systemB.h
index 75c7694..a3e430f 100644
--- a/bau_systemB.h
+++ b/bau_systemB.h
@@ -25,6 +25,7 @@ public:
     bool enabled();
     void enabled(bool value);
     void readMemory();
+    void addSaveRestore(SaveRestore* obj);
 protected:
     virtual DataLinkLayer& dataLinkLayer() = 0;
     virtual uint8_t* descriptor() = 0;
@@ -61,6 +62,7 @@ protected:
 
     DeviceObject _deviceObj;
     // pointer to first private variable as reference to memory read/write commands
+    // addesses are to big for memory read/write calls on 64bit systems otherwise
     uint8_t* _memoryReference;
     Memory _memory;
     AddressTableObject _addrTable;