Reference.choice now supports model arg