Add more quotes
Add toggle for explicit quotes