Add support for re-checking services