Added basic quote support