Add support for neighborhoods