Update code to new private container expectations