Added support for nested structures.