Added structural matching