Better support for some Map functions

See ChangeLog.md update here. Pinging @gregwebs