Added support for the mapping name.