Created extended structure matching for a clean layer system.