Data Validator changes

Each commit represents a story.