Added Checks for whitespace and validations