Adding support for find_and_modify method