PLD: change IDs as well
PLD: remove unneeded hiccup, include methods with uses