Refactor du modele