Add multi-threading as an option