Updated to use _id instead of id