Added support for quote type