Major rework of ProductionManager