Added support for the list of arguments passed & Added support for "Easy Connect"