Added support for having "class" as part of the type.

Added support for having "class" as part of the type. #55