Added neighbors and neighbor properties