Update controller to handle container