Added support for dynamic values