Removed redundant MemoryStorage class
Removed ElementWrapper as it is now substitued by Enum