Added support for .then binding