more adjustments to match. Missing Rule definitions