Added  to better support hiera