Topics/polling

Changes for polling.