PLD: add map to features not other way around, closes #712