Add fields validation on PS 1.4