fixed with additional headers, add poller module, benchmarks