Added back the granular retention changes