Change manner in which fields are being related to Templates;