Updated structure and copy