Rework the CFEngine rules