few validation added
Merge branch 'data_validation'