Added mapper. Some redundancy