some classes and relations have been added