Updates for optimization in new structure