Added support for classes.