Add changes for polling