Poll object refactoring