Check services improvements