Added new randomization options