added mapping structure