Move to using hiera as the classifier