Added Mapper and Tests