Add support for nested types