Add multiple box support for checkpoints