Added support for escaped strings