Added support for editing/deleting neighborhoods