Some more tuning in the new Memory-class