It looks different because classes were just changed recently. If you go back to 3.6, you'll see how the RuleDate class fit into the rest of the structure. I haven't reviewed your changes just yet, but I'll check them out. I've been researching the class in my spare time for about a month.