Add multiple pages support