Moving service restart block out from configure