Refactoring and new relationship threads