Change to database classes, introducing Storage and SubStorage, a more general propose implementation of the same kind of thing. SubStorage creates a key value store inside a key value store.