Move from using _ip to _id