Modify for non-wrapper named structure