Added attribute mapper