Some changes for reverse routing with host support