Added new constants for neigbor handling