Fixed the way classes are defined.