First changes to support 'rule combos'