Add proper command line parsing