Add multi-pages support