Adding Matching and Claiming to Customer Applications controller