add support for $class