Added command line arguments feature