Error correction and, moved X937Record creation to new factory class.