Reverted to class-only matching for illustration