Commit on Nov 4 for CKP #13 - Dictionaries