Added support for auto-discovery of connection requirements
Implemented Binod's null fix
Altered context requirements