Added struct support - still buggy.