Updated to newer use of hiera