Hiera refactor