Added support for mapping blocks.