Added struct support.