Add Deferred support