- added support for When/then chaining