#359  Enhance subnet management