Support for limited num files per bundle