Improved options initialization