Comment by dillonnys

> It could be part of the service contract.

Agreed. I'll look into how we can add that.