Add basic auto-escaping