Actually use references rather than item identifier when tracking slots