Add threading to module handler