Added more classes on class sections