More work on record creation