Some class refactoring and pager started