Enhance pagination