Add support for blocks