Adding IP control and field validation