add escape support