refactor PollHandler and fix model service