added PagingBuilder
added QueryBuilder
refactor