[Background] Refactoring des Entity -> IEntity