Adding categories for classes
merging