Added -s flag and concurrency to generation