na - adding more mapping