Paginator Adapter Interface restructure