Refactor des models