Add support for randomization