Factored out interface to storage, now using specific keys for song lookup