Add fields validation