added module as config parameter
enhancements and expansion