added mapping functions