Convert delivery tag to value class
Remove Exchange.Default
Add comment to DeliveryTag