RFC: Optimize Hardware Matching