Categories, Subcategories, and Recurrence features added