Feature/improved options logic