Added ability to escape with quotes