Added changes to allow server polling.