Updated Random FOL generator