Added Classes for categorizing, filtering and sorting