Move to universal dictionary creation