Change find_by method