Switch to using a record for data structure identification