Moving more calls to deferred operation