Resolve #40: Connectivity