More changes to find_by