Added blocks support