Added CategoryClass