Cleaner hiera implementation & support non hiera setups