Some DSD Validation added back
Bug fixing