Improve international trains support