Fix data container integration.