Added struct support.
Fixed block bug.