Added pillar option to override check defaults