- Add quote handling