Add Train Functionality enhanced