Added support for auto-discovery of connection requirements