Major update to pillar and salt