Command line parsing added