Add AllowContainers option