Moving more configuration to pillars