Added support for classes in headers