Doing refactor for rail container.