Added parser to escape quotes