Upgrade map to support parameter maps