Added dimension info to temporary variables