Upgraded ClassManifest