Rebuilt command line option handling