enhance find_by method