Added configurable _map-keys and _map-values functions