Adding gradual subnet support