Command-line arguments handling added