Adding Mapper interface, working on new *map util*