Improve polls current module