Auto resolve storage keys