Add transparent pagination support