Update design and structure