Updated due to optimalityOfDispatches.Rdependency