Rework salt states to support versions in pillar