This method will be removed in a futur refactoring