Moved Random to another class