Added parsing of current storage key, broke the tests.