Deprecated classes removed. Schemata updated