Static dictionary.. it was all going so well..
Merge commit '91fc7ca455c7aa24a94453d729179412ec399558'