added EDNS0 Subnet support and added local changes