Added the lastest classes and changes