Add some extra mapper, for standardization and convenience.
Fix line wrapper between map