Added struct support