Added support for random words