Factory and restructuring changes