Add proper delimiter escaping and support multiple columns