Adapt to move of dispersion code