Refactoring iDiscoverv2