Added neighborhoods and user_neighborhood links