Added frandom support