ToursApiDCR code review rework