Added template unexpanding functionality