Use expiry model
Rebuild bundle