Added uid and _id