Further changes to record handling.