Fix: Update rule to use the new data model