Added New classes and charts