Adding support for module config