Moved ThreadStorage class to another File