Add setup and change structure