Added support for blocks, actions