Refactor from deprecated find_by methods