Update for blocks support