Refactored common elements for normal and upstream journeys