Support thread integration, work in progress