Started adding stochastic support