Replace deprecated find_by_* with find_by