Add basic support for more record types