Reworked with common.sls and pillar variables