Added support for nested class types