Improving modularity for multistart and datasets.