Switching from Server pointers to server ids