Adding support for checking on all servers