Use enum instead of String key, add :substitution
More lang stuff