More Hiera chapter enhancements