New data structure sanity pass