Argument renaming, expose ObjectId for queries