Setup appropriate 'required' validation rules for fields

Change-Id: I060ebab3a3463487963eb9c53b0659de704b8846