Added fields to the arguments.
Checking for empty fields.