Initial support for dynamic-wind