Added real support for classes.