Added support for custom block-tags.