Some more refactoring - correcting the NLS warnings, having separate
dict properties.