Data Validator changes

First commit: Story 266
Second commit: Story 264
Following commits: corrections