adding support for dynamic configuration