PLD: make metadata a map to match spec