Updated memory class