Add Long-Polling proper support