Added a client-side polling