Added support for when_any