Improve FindOptions, Add UpdateOptions.