Simplify things... new schema
Filling out the record converter
Cleanup and save code