Added keep alive polling