Improve findAndModify.