Removed paging, moved to other class