Issue #287: Updates Reachability class