Improved polling and Session handling