Update to include neighbor associations