Adding code to handle multiple hosts per node connector