State remodeling for subnets and zones + bug 8