Change the way classes are handeled