ADD: Mapper support for the framework