Refactored Neighbour to perform fewer read queries.