add quotes support