Seems that using Promises will force us to rewrite a bunch of things and related unit tests :) Pull request is growing and growing :)