Update the structure and design