Adding support for nested structs...