Added structures and complex types.