Add support for all block types.