Added MemoryManager functionality