Reworking rule validation