Refactored to add string validations