Redesign container allocation.