use VersionStorage, fixes #3