Improved performance (30%). Fixed issue with long command line.