Improved handling of ip in schema.
Improved handling of ip in schema.