Specific changes for Tensor