Moved substitution to separate dictionary.