Change ids to use short instead of ints