Added in server polling