Restructure for durability