Improve struct support: