Remove the need to append ObjectId