Add page limit support