Refactor what we store.
Add back references.