Update structure and base template