Move dictionary storage to metadata
Move store to metadata