Updated rule validation