Structure fixes
Structure fixes