Fixed Hiera instances structure