#228 #209 Refactoring Paging Area