Added automatic pagination support
Refactor: removed paginator