Added escaping literal values