Updated with mapping detail