Refactorisation des mappers