added support for struct.