CategoriesExtension refactoring