Include module name in module
Adding support for ConfigurationFactory