More train model updates