Restructure update section