Added command line arguments handling