Enhancement from connectivity test.