Restructure asset handling