Added EntityHashMap
Extracted MetadataModule from StoreModule