Refactor EventPager