Added Validation checks