Issue #24. More dictonaries