Move thread options into a seperate structure