Update fig to use multiple data containers.