Seems like three service do this now.  Should this be universalized?