Improving efficiency of components and group instance match
Matching only currently handled formats