improved options management