Smarter option handling