Update to use more hiera_include classes