Refacture component finder, use the generic type finder now