Updated for requirement R001 w.r.t. IP addresses