Add multi page support