Improved the deferred flow in the client