Adding more categories and classes;