adding support for classes