Added code for mapping table entry