Updated Regex validation