Added & enabled frandom support