Move functions back to finders