Moved TFS code to specific class