Reorganised the whitelist and ensure subnets exist