Better option parsing