Add run time randomization