Rebuilt bundle class