No more class inclusion via hiera