Added support for dynamic configuration