Modified save mapping.