Migrate to inject and simplify find_all methods