Added prune-map-scalars