Added fields verification