Added more support for Class Specifiers