Updated model rules for the new fields