Adding bubble up functionality to extraction