Don't really like having logic here specific to some types of RTI, could we refactor and extract what is specific to rail? We'll be able to follow the same pattern for all the different types of RTI.