Move find_by_id_or_name to a module and extend with it