Use new separator everywhere