rules-plan mapping changes