Improved: References resolved in MODEL RULES clause