Added validation to fields
Merge branch 'dev_validation'