Add namespacing for user based threads
Update for user based threading