Refactored component finding