Make templateFields nullable
Version up