Add support for classes