Adding support for classes.