Added attached blocks support
Fixed