Fix DiscoveryModel issues related to refactorisation - Adrien / Clement