Added ID conversion