Made both states configurable per user in pillar data
Had to drop extend, for this otherwise the extend would be empty if manage is
False