Added partialy Threading support