Better hiera support