Use new options for container
Updated F