Add /adv/ and /trv/ support

DOES IT EVER STOP?