Added basic validation
Merge remote-tracking branch 'remotes/origin/feature/valication' into add_tests