Add views & name scope to DictionaryEntries
Fix merge thing