Added support for config parameter