Added more types
Added ip4, ip6 address defs
Added jail