Move getRandom* methods into appropriate classes