PMO-2746 Minor refactor to allow simply adding in ordering also the simulations.