added support for classes and races