Note our upgrade path for this functionality