Refactored base
Fixed some hiera keys