add mapping logic