Tidy up new record API