Refactoring to only require mandatory params in hiera