Add conversion/mapping functions