Reworked storage key