Enhancements to modifiable retention (Oct 2022)