PLD: abstract and add lookup routes