Added support for blocks