Large changes to FindComponents