Simplify and add hiera