Enhanced to split command line arguments.