Build pillar data while allowing extra pillar key/values