Adjusted deferred handlers