Improve the generation and the polling