Adding IPv4/IPv6 support  &  Flexibilizing the CLI