switched VersionedStore in Database from inheritance to composition