Added switch for fusion discovery