Add findAndUpdate and findAndRemove API