diff --git a/scripts/make_database.py b/scripts/make_database.py
index 51269da00efe1e990ba8b8c051c471d5d7656e7b..1fd6120b38551121041ecf79c487a8caf66c5d33 100755
--- a/scripts/make_database.py
+++ b/scripts/make_database.py
@@ -5,8 +5,8 @@ import logging
 from datetime import datetime
 
 from metobscommon.model import RrdModel, ModelError
-from aosstower.record import Record, LineParseError
-from aosstower.model import initialize_rrd, VARS
+from aosstower.l00.parser import read_records 
+from aosstower.l00.rrd import initialize_rrd
 
 LOG = logging
 
@@ -41,6 +41,7 @@ if __name__ == '__main__':
         LOG.info("Enter time ordered data files, one per line, ^D when done")
         args.files = sys.stdin
 
+
     for each in args.files.readlines():
         fpath = each.strip()
         if not os.path.exists(fpath):
@@ -48,15 +49,7 @@ if __name__ == '__main__':
             continue
 
         LOG.info("adding %s", fpath)
-        for line in open(fpath).readlines():
-            if not line.strip():
-                continue
-            try:
-                record = Record.create(line)
-            except LineParseError as err:
-                LOG.error(str(err))
-                continue
-
+        for record in read_records(fpath):
             try:
                 rrd.add_record(record['stamp'], record)
             except ModelError: