Complete implementation of new thread layout