Added Mapper and MultiMapper classes