Added Frandom support