Performance improvements and built-in handling of quotes.