Adding memory manager