Issue #2333029 by twistor, MegaChriz: Extend mapping API to allow for defaults and multiple callbacks
