Added polling support for heroku