Matching layer handling