Added polling infra