Updated classes and manual