Add @struct annotation where possible