Added support for nested types