Added fields validation