Refactor states to use common_topology pillar data