Settings and Setup-map use new dictionary construction