Move to Option[] for container, same as AppUpdate.