Renamed mapper and added namespace