adding support for blocks