Modified to use hiera data (first attempt)