Add WithoutString
Update to regex