Update structure & code