Get rid of rec_id stuff, persist all fields