Code refactor: Move DataValidation related xml code