Slight modification in handling dimension names.