Many restructuring improvements