Updates for memory efficiency