Add auto structure. WIP