Added support for random categories