Updated LibOptionsGenerate