Changing hierarchy of match types