Re #1296 Adding more record types.