Updated Hdfrc local storage logic