Fixed a small bug in generators
Added more fields for IPv4 and IPv6