Added support for multiple shakers and more options for randomness