Add support of Email connector
Improve working sets - set also the "parent" module in the dedicated
working set for its children