Better option handling