Refactorisation, more hiera oriented