Add proper command-line option parsing