Better option handling.