Updates for memory optimization.