Added support of respecting quotes