added mapping by name