CLSN-2147 : moved shared logic of record creator in one file