Added hiera support