Several changes to add more traces and avoid creating several instances of component finder