Added support for quote, raw pairs WIP