Str and Validator improvements