Improve hiera interface