Added long support; started on threads