Some work on paginator adapter