Add Inet and Cidr support