Add deferred buffer flush