Improve ObjectId API