Better multi-page support, less configuration required