Added command line option handling