Change type of deliveryTag from String to Long