added quote support