improve multi-train support