Move dictionary storage to metadata